summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMu Qiao <qiaomuf@gentoo.org>2011-09-03 17:46:33 +0800
committerMu Qiao <qiaomuf@gentoo.org>2011-09-03 17:46:33 +0800
commit98eea2da4a10906ba36bfcf2d9c6f8584d518628 (patch)
tree55135c271d8c7458f271e235be3b085637ef6624
parentfcitx-configtool: version bump (diff)
downloadqiaomuf-98eea2da4a10906ba36bfcf2d9c6f8584d518628.tar.gz
qiaomuf-98eea2da4a10906ba36bfcf2d9c6f8584d518628.tar.bz2
qiaomuf-98eea2da4a10906ba36bfcf2d9c6f8584d518628.zip
fcitx: fix ldflags
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 17B157E9)
-rw-r--r--app-i18n/fcitx/Manifest17
-rw-r--r--app-i18n/fcitx/fcitx-4.1.0.ebuild6
-rw-r--r--app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch18
3 files changed, 32 insertions, 9 deletions
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 30ade95..ac4bbf6 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX fcitx-4.1.0-fix-ldflags.patch 1155 RMD160 62e20dd2999667b49bcb2a84a81fb3119dc7b7d3 SHA1 42b44972c3e8404516612a15f9f03fd30ecfc3e1 SHA256 673f82427b2650c8821607b6c2654711070ae217b9091b2d2e1afb24802c679d
DIST fcitx-4.1.0_all.tar.bz2 6553478 RMD160 9bc1165c346d3a58d63439df58c61a01fa2c5c38 SHA1 1a78bd170cb8ab0bbbb9e15117fcc8225ee7a4c9 SHA256 21ed00b81cda9234948c42c8adb03a1858f13836ed7ec233e0d75e5b43d9cbd8
-EBUILD fcitx-4.1.0.ebuild 1838 RMD160 cf6171765d512034600f7da3e71cc3cd61e8e097 SHA1 c99c5d467e4f98ceb5e2cd2c0c4692179b208d49 SHA256 2461ea76c93c3f2e6b1ce123ac1175845ae899d6770c699c5972b8c17a3e9195
+EBUILD fcitx-4.1.0.ebuild 1909 RMD160 09c65de3e7a678aabe2a5de33fe6d6470f743a19 SHA1 f5ad54730ba0a3017fe9fd61e68c6eb85b34d8fc SHA256 50cb8e1820c2577d16a9fc1c75c188e4119f2534bf94c541fcbaee69fc01e672
MISC ChangeLog 5270 RMD160 9c653114a72df618809e3dd9d6ebd70891739456 SHA1 51ab8c3ae8293b1d86999fc121e9e063194b4b80 SHA256 2dc0b650f697431871426e830a6527869217c7d3982763df73da2bfee9736b3f
MISC metadata.xml 448 RMD160 22554cba014d588f3536765426c3414166120d62 SHA1 12732807d9e43918ba3a8243f4eaadfc59d9a603 SHA256 27f577d53217c8613ac4ae8ac4e99de2f95fc940affd77f64c204cb39e4535c4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJOYe1LAAoJEDCzDeQXsVfpGIwH/1FZRNFQ8TKr4s4o979DXUof
-OduYcaImpfHQkRsDbaNBkZkKdKy1Uw7tHReFhpWPUptcXOlAe7rHNE7kiwPO/49N
-rYjfCwKpme1g3uZBpwOqAH6IfGSa58BskswvYRoGphElkRCRjBfNfhIGoue6X8X/
-Vw5YqV5FpRwNQ6h9FIH0saNzYmXINhYReHbHWYTIpjEjETnlyDPhDJGAyRL3Rb9x
-dtwuHozh4GjrZ/VdfL37ph3EE0+CxSvXpyni+fCl4es1FHG27Me/kQ6kj4FFv0Yo
-WkgCsUutqqSB2gqlFS2gR2/GILlu7mxoiD6GREwfHsFGwH95AwyInVYcEeJlhcQ=
-=ygcn
+iQEcBAEBAgAGBQJOYfd5AAoJEDCzDeQXsVfp/70IAI+PMTBJSOe5rbFUAAQLS5+f
+tg+veEOcEV4Q7LvQUDuEYwZI75x/PWAx1P+qJUcBK0lItUwBNVAUF5Uzyay9il9D
+bMmwjaNbSNdC7whby3oIv5APcuTQF+0E4ZaOP8nVsFrfcvJ2rfkUq+zQLwLj0SKW
+96nCekEt9tezzcFzIKjKQN2Y5btyf7b1fnBh5MU9Q4bHz7/7l7YQ0Fnt4/oAcGGP
+0dny3fDiCTmDFt2So074IlG92cvUZoYiW55zAsPNH2spv56PDSW2agG0bDoQs90U
+NZwhYPexag9hur3UOtmQ3HKp6nT0Xuv9UgpBnreZ5Jlf+x5bIHxo3CiSTIYyshQ=
+=AjTD
-----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-4.1.0.ebuild b/app-i18n/fcitx/fcitx-4.1.0.ebuild
index 9d2fb2a..79ca18e 100644
--- a/app-i18n/fcitx/fcitx-4.1.0.ebuild
+++ b/app-i18n/fcitx/fcitx-4.1.0.ebuild
@@ -4,7 +4,7 @@
EAPI="3"
-inherit cmake-utils
+inherit cmake-utils eutils
DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
HOMEPAGE="http://www.fcitx.org/"
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
x11-proto/xproto
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-ldflags.patch"
+}
+
src_configure() {
local mycmakeargs="
$(cmake-utils_use_enable cairo)
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
new file mode 100644
index 0000000..0ca5097
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch
@@ -0,0 +1,18 @@
+diff -r f6cd2db5d10f -r faf8d566e65f CMakeLists.txt
+--- a/CMakeLists.txt Sat Sep 03 13:01:35 2011 +0800
++++ b/CMakeLists.txt Sat Sep 03 17:20:16 2011 +0800
+@@ -126,10 +126,10 @@
+ set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir})
+ set(FCITX4_PACKAGE_NAME ${package})
+
+-set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden")
+-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden")
+-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed")
+-set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed")
++set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
++set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
++set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
++set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
+ add_definitions("-D_GNU_SOURCE -DFCITX_HAVE_CONFIG_H")
+
+ configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)