summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-i18n/fcitx/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-i18n/fcitx/files')
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch b/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
new file mode 100644
index 000000000000..218f0e8312cf
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
@@ -0,0 +1,43 @@
+From 4c703e395b55e939f3ac1e4a4bf5cd36aa5b0abc Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sat, 26 Jan 2013 14:40:00 -0500
+Subject: [PATCH] [fcitx] fix compatible with gcc 4.6
+
+---
+ src/lib/fcitx/module.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/fcitx/module.h b/src/lib/fcitx/module.h
+index 28de64f..bae6601 100644
+--- a/src/lib/fcitx/module.h
++++ b/src/lib/fcitx/module.h
+@@ -109,7 +109,7 @@
+ void* FcitxModuleInvokeFunction(FcitxAddon* addon, int functionId, FcitxModuleFunctionArg args);
+ #define FcitxModuleInvokeVaArgs(addon, functionId, ARGV...) \
+ (FcitxModuleInvokeFunction(addon, functionId, \
+- (FcitxModuleFunctionArg){ .args = {ARGV} }))
++ (FcitxModuleFunctionArg){ {ARGV} }))
+
+ /**
+ * invoke inter module function with addon name, returns NULL when fails (the function itself can also return NULL)
+@@ -133,7 +133,7 @@
+ #define InvokeVaArgs(INST, MODULE, FUNC, ARGV...) \
+ ((MODULE##_##FUNC##_RETURNTYPE)FcitxModuleInvokeFunctionByName( \
+ INST, MODULE##_NAME, MODULE##_##FUNC, \
+- (FcitxModuleFunctionArg){ .args = {ARGV} }))
++ (FcitxModuleFunctionArg){ {ARGV} }))
+
+ /** add a function to a addon */
+ #define AddFunction(ADDON, Realname) \
+@@ -215,7 +215,7 @@
+ }
+
+ #define FCITX_DEF_MODULE_ARGS(var, ARGV...) \
+- FcitxModuleFunctionArg var = { .args = {ARGV} }
++ FcitxModuleFunctionArg var = { {ARGV} }
+ /* void *__##var##_array[] = {ARGV}; \ */
+ /* size_t __##var##_length = sizeof(__##var##_array) / sizeof(void*); \ */
+ /* FcitxModuleFunctionArg var[] = { { .n = __##var##_length, \ */
+--
+1.7.10
+