1 |
commit: 98eea2da4a10906ba36bfcf2d9c6f8584d518628 |
2 |
Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 3 09:46:33 2011 +0000 |
4 |
Commit: Mu Qiao <qiaomuf <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 3 09:46:33 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/qiaomuf.git;a=commit;h=98eea2da |
7 |
|
8 |
fcitx: fix ldflags |
9 |
|
10 |
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 17B157E9) |
11 |
|
12 |
--- |
13 |
app-i18n/fcitx/Manifest | 17 +++++++++-------- |
14 |
app-i18n/fcitx/fcitx-4.1.0.ebuild | 6 +++++- |
15 |
app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch | 18 ++++++++++++++++++ |
16 |
3 files changed, 32 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest |
19 |
index 30ade95..ac4bbf6 100644 |
20 |
--- a/app-i18n/fcitx/Manifest |
21 |
+++ b/app-i18n/fcitx/Manifest |
22 |
@@ -1,18 +1,19 @@ |
23 |
-----BEGIN PGP SIGNED MESSAGE----- |
24 |
Hash: SHA1 |
25 |
|
26 |
+AUX fcitx-4.1.0-fix-ldflags.patch 1155 RMD160 62e20dd2999667b49bcb2a84a81fb3119dc7b7d3 SHA1 42b44972c3e8404516612a15f9f03fd30ecfc3e1 SHA256 673f82427b2650c8821607b6c2654711070ae217b9091b2d2e1afb24802c679d |
27 |
DIST fcitx-4.1.0_all.tar.bz2 6553478 RMD160 9bc1165c346d3a58d63439df58c61a01fa2c5c38 SHA1 1a78bd170cb8ab0bbbb9e15117fcc8225ee7a4c9 SHA256 21ed00b81cda9234948c42c8adb03a1858f13836ed7ec233e0d75e5b43d9cbd8 |
28 |
-EBUILD fcitx-4.1.0.ebuild 1838 RMD160 cf6171765d512034600f7da3e71cc3cd61e8e097 SHA1 c99c5d467e4f98ceb5e2cd2c0c4692179b208d49 SHA256 2461ea76c93c3f2e6b1ce123ac1175845ae899d6770c699c5972b8c17a3e9195 |
29 |
+EBUILD fcitx-4.1.0.ebuild 1909 RMD160 09c65de3e7a678aabe2a5de33fe6d6470f743a19 SHA1 f5ad54730ba0a3017fe9fd61e68c6eb85b34d8fc SHA256 50cb8e1820c2577d16a9fc1c75c188e4119f2534bf94c541fcbaee69fc01e672 |
30 |
MISC ChangeLog 5270 RMD160 9c653114a72df618809e3dd9d6ebd70891739456 SHA1 51ab8c3ae8293b1d86999fc121e9e063194b4b80 SHA256 2dc0b650f697431871426e830a6527869217c7d3982763df73da2bfee9736b3f |
31 |
MISC metadata.xml 448 RMD160 22554cba014d588f3536765426c3414166120d62 SHA1 12732807d9e43918ba3a8243f4eaadfc59d9a603 SHA256 27f577d53217c8613ac4ae8ac4e99de2f95fc940affd77f64c204cb39e4535c4 |
32 |
-----BEGIN PGP SIGNATURE----- |
33 |
Version: GnuPG v2.0.17 (GNU/Linux) |
34 |
|
35 |
-iQEcBAEBAgAGBQJOYe1LAAoJEDCzDeQXsVfpGIwH/1FZRNFQ8TKr4s4o979DXUof |
36 |
-OduYcaImpfHQkRsDbaNBkZkKdKy1Uw7tHReFhpWPUptcXOlAe7rHNE7kiwPO/49N |
37 |
-rYjfCwKpme1g3uZBpwOqAH6IfGSa58BskswvYRoGphElkRCRjBfNfhIGoue6X8X/ |
38 |
-Vw5YqV5FpRwNQ6h9FIH0saNzYmXINhYReHbHWYTIpjEjETnlyDPhDJGAyRL3Rb9x |
39 |
-dtwuHozh4GjrZ/VdfL37ph3EE0+CxSvXpyni+fCl4es1FHG27Me/kQ6kj4FFv0Yo |
40 |
-WkgCsUutqqSB2gqlFS2gR2/GILlu7mxoiD6GREwfHsFGwH95AwyInVYcEeJlhcQ= |
41 |
-=ygcn |
42 |
+iQEcBAEBAgAGBQJOYfd5AAoJEDCzDeQXsVfp/70IAI+PMTBJSOe5rbFUAAQLS5+f |
43 |
+tg+veEOcEV4Q7LvQUDuEYwZI75x/PWAx1P+qJUcBK0lItUwBNVAUF5Uzyay9il9D |
44 |
+bMmwjaNbSNdC7whby3oIv5APcuTQF+0E4ZaOP8nVsFrfcvJ2rfkUq+zQLwLj0SKW |
45 |
+96nCekEt9tezzcFzIKjKQN2Y5btyf7b1fnBh5MU9Q4bHz7/7l7YQ0Fnt4/oAcGGP |
46 |
+0dny3fDiCTmDFt2So074IlG92cvUZoYiW55zAsPNH2spv56PDSW2agG0bDoQs90U |
47 |
+NZwhYPexag9hur3UOtmQ3HKp6nT0Xuv9UgpBnreZ5Jlf+x5bIHxo3CiSTIYyshQ= |
48 |
+=AjTD |
49 |
-----END PGP SIGNATURE----- |
50 |
|
51 |
diff --git a/app-i18n/fcitx/fcitx-4.1.0.ebuild b/app-i18n/fcitx/fcitx-4.1.0.ebuild |
52 |
index 9d2fb2a..79ca18e 100644 |
53 |
--- a/app-i18n/fcitx/fcitx-4.1.0.ebuild |
54 |
+++ b/app-i18n/fcitx/fcitx-4.1.0.ebuild |
55 |
@@ -4,7 +4,7 @@ |
56 |
|
57 |
EAPI="3" |
58 |
|
59 |
-inherit cmake-utils |
60 |
+inherit cmake-utils eutils |
61 |
|
62 |
DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method" |
63 |
HOMEPAGE="http://www.fcitx.org/" |
64 |
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND} |
65 |
x11-proto/xproto |
66 |
dev-util/pkgconfig" |
67 |
|
68 |
+src_prepare() { |
69 |
+ epatch "${FILESDIR}/${P}-fix-ldflags.patch" |
70 |
+} |
71 |
+ |
72 |
src_configure() { |
73 |
local mycmakeargs=" |
74 |
$(cmake-utils_use_enable cairo) |
75 |
|
76 |
diff --git a/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch b/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch |
77 |
new file mode 100644 |
78 |
index 0000000..0ca5097 |
79 |
--- /dev/null |
80 |
+++ b/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch |
81 |
@@ -0,0 +1,18 @@ |
82 |
+diff -r f6cd2db5d10f -r faf8d566e65f CMakeLists.txt |
83 |
+--- a/CMakeLists.txt Sat Sep 03 13:01:35 2011 +0800 |
84 |
++++ b/CMakeLists.txt Sat Sep 03 17:20:16 2011 +0800 |
85 |
+@@ -126,10 +126,10 @@ |
86 |
+ set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir}) |
87 |
+ set(FCITX4_PACKAGE_NAME ${package}) |
88 |
+ |
89 |
+-set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden") |
90 |
+-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden") |
91 |
+-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed") |
92 |
+-set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed") |
93 |
++set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}") |
94 |
++set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}") |
95 |
++set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") |
96 |
++set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") |
97 |
+ add_definitions("-D_GNU_SOURCE -DFCITX_HAVE_CONFIG_H") |
98 |
+ |
99 |
+ configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h) |