Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/fcitx/files: fcitx-4.2.7-gcc46-compatible.patch
Date: Thu, 31 Jan 2013 08:42:45
Message-Id: 20130131084241.172E520081@flycatcher.gentoo.org
1 yngwin 13/01/31 08:42:41
2
3 Added: fcitx-4.2.7-gcc46-compatible.patch
4 Log:
5 Version bump, bug #454482. Thanks to Dennis Lan and Wang Jiajun for contributions.
6
7 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.1 app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch?rev=1.1&content-type=text/plain
14
15 Index: fcitx-4.2.7-gcc46-compatible.patch
16 ===================================================================
17 From 4c703e395b55e939f3ac1e4a4bf5cd36aa5b0abc Mon Sep 17 00:00:00 2001
18 From: Weng Xuetian <wengxt@×××××.com>
19 Date: Sat, 26 Jan 2013 14:40:00 -0500
20 Subject: [PATCH] [fcitx] fix compatible with gcc 4.6
21
22 ---
23 src/lib/fcitx/module.h | 6 +++---
24 1 file changed, 3 insertions(+), 3 deletions(-)
25
26 diff --git a/src/lib/fcitx/module.h b/src/lib/fcitx/module.h
27 index 28de64f..bae6601 100644
28 --- a/src/lib/fcitx/module.h
29 +++ b/src/lib/fcitx/module.h
30 @@ -109,7 +109,7 @@
31 void* FcitxModuleInvokeFunction(FcitxAddon* addon, int functionId, FcitxModuleFunctionArg args);
32 #define FcitxModuleInvokeVaArgs(addon, functionId, ARGV...) \
33 (FcitxModuleInvokeFunction(addon, functionId, \
34 - (FcitxModuleFunctionArg){ .args = {ARGV} }))
35 + (FcitxModuleFunctionArg){ {ARGV} }))
36
37 /**
38 * invoke inter module function with addon name, returns NULL when fails (the function itself can also return NULL)
39 @@ -133,7 +133,7 @@
40 #define InvokeVaArgs(INST, MODULE, FUNC, ARGV...) \
41 ((MODULE##_##FUNC##_RETURNTYPE)FcitxModuleInvokeFunctionByName( \
42 INST, MODULE##_NAME, MODULE##_##FUNC, \
43 - (FcitxModuleFunctionArg){ .args = {ARGV} }))
44 + (FcitxModuleFunctionArg){ {ARGV} }))
45
46 /** add a function to a addon */
47 #define AddFunction(ADDON, Realname) \
48 @@ -215,7 +215,7 @@
49 }
50
51 #define FCITX_DEF_MODULE_ARGS(var, ARGV...) \
52 - FcitxModuleFunctionArg var = { .args = {ARGV} }
53 + FcitxModuleFunctionArg var = { {ARGV} }
54 /* void *__##var##_array[] = {ARGV}; \ */
55 /* size_t __##var##_length = sizeof(__##var##_array) / sizeof(void*); \ */
56 /* FcitxModuleFunctionArg var[] = { { .n = __##var##_length, \ */
57 --
58 1.7.10