Gentoo Archives: gentoo-commits

From: Mu Qiao <qiaomuf@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/qiaomuf:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/
Date: Wed, 02 Nov 2011 09:11:26
Message-Id: a0e4cb58d6460fde9337f8074672904135e76f29.qiaomuf@gentoo
1 commit: a0e4cb58d6460fde9337f8074672904135e76f29
2 Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 9 06:42:36 2011 +0000
4 Commit: Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 9 06:42:36 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/qiaomuf.git;a=commit;h=a0e4cb58
7
8 fcitx: version bump
9
10 (Portage version: 2.1.10.14/git/Linux x86_64, signed Manifest commit with key 17B157E9)
11
12 ---
13 app-i18n/fcitx/Manifest | 19 +++++++++----------
14 .../{fcitx-4.1.0.ebuild => fcitx-4.1.1.ebuild} | 4 ----
15 app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch | 18 ------------------
16 3 files changed, 9 insertions(+), 32 deletions(-)
17
18 diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
19 index 014010a..a49937e 100644
20 --- a/app-i18n/fcitx/Manifest
21 +++ b/app-i18n/fcitx/Manifest
22 @@ -1,19 +1,18 @@
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 1907 RMD160 bfcd4c2b7c42922868b73d5af06ae3de226ae4a8 SHA1 d8cecf938f5e4cecc1fd32a1f24bcde45763260b SHA256 ff0b416563f59be9d04b3c95a93c4b1f2aad9ca435fdae4cce81992f06e0ed9f
29 +DIST fcitx-4.1.1_all.tar.bz2 6547617 RMD160 a520787fadcd65a3d9f810fa78633f9a0c60c361 SHA1 8924b14b5488a3f2e8b5d745507e319b70c4848c SHA256 ca7aa74ef3b1e80f2b1b882fdbc977b2bdd0a3eb75dd470fb159c703e0da9a75
30 +EBUILD fcitx-4.1.1.ebuild 1843 RMD160 67c279e608828a850f8b9d030fc055c9d332d654 SHA1 1fbe1e82691696715bc7e2fc4fa3b24d6f443044 SHA256 6cde1fa18be1b0912424cf1695b399bd3ef93ba0f6d5b62a985282cffb0691c6
31 MISC ChangeLog 5270 RMD160 9c653114a72df618809e3dd9d6ebd70891739456 SHA1 51ab8c3ae8293b1d86999fc121e9e063194b4b80 SHA256 2dc0b650f697431871426e830a6527869217c7d3982763df73da2bfee9736b3f
32 MISC metadata.xml 448 RMD160 22554cba014d588f3536765426c3414166120d62 SHA1 12732807d9e43918ba3a8243f4eaadfc59d9a603 SHA256 27f577d53217c8613ac4ae8ac4e99de2f95fc940affd77f64c204cb39e4535c4
33 -----BEGIN PGP SIGNATURE-----
34 Version: GnuPG v2.0.17 (GNU/Linux)
35
36 -iQEcBAEBAgAGBQJOYfiFAAoJEDCzDeQXsVfpr18IAMS+IoFx2ttQ+NyoatOrf+ua
37 -9AB3n5WALD0SEFWaSqnX9ohWWC9vk+kRbw1Dw37io3TkkCbP+EdawUU9aVD2Oax8
38 -rWZUWUJ1aJlgqoJ9J/jb2qaIGYoU8E2BLHTBG6lDFiFjYcrTH5/9jS3ucvwK7YVa
39 -QrkQlOfC7v+gAjyh2WUfQ+OzQ1HnlKFuP/63tmMN/yFMyvQLIRjz8pPTI/7Tkt01
40 -Y8dDqiuDwFDi1LJz7MyaMiIGAcsdRxtwQjV1yido/b+FuC0xlHT8vT4+K873MoFz
41 -YyR/OlfWJn2pBW6NihtnCpKY8kkIvhtoMvO4Gj5tlT63NpvppYEMOOzIXTfz8SA=
42 -=t5rR
43 +iQEcBAEBAgAGBQJOabVcAAoJEDCzDeQXsVfpok8IAJNrz5zYai/5rrszD2hhVtyp
44 +z6IZSdJer6pJ+nrwkf/hX94BwxMAgjdE6wa0bxmaPxKtiHDUE3g2bJEHwKbZyFZ1
45 +lTleHhr34u5XKUqIp4XAP9PjfgzM0xoBsQaJV+shDzhCP537TMpTqttzG5V6jpxY
46 +Ri8fOT/e+aqWUUQV/skBoG/LgAb3WLV0srE8Fua4Y1VdafoUfZghdLoYIEbFiZ1k
47 +RaHaT/HgJckfQsQd3XjOHNFSUDXOGsmf0FLZNW4yAZqU5b2UUpvFhjYHhVQhkWjs
48 +H7C+MDV1rPS3MM2gPX2fWngDwpRBQTZX9YEIcw7dT5n4DUv+uyDZ5dHenieCmNo=
49 +=nKl0
50 -----END PGP SIGNATURE-----
51
52 diff --git a/app-i18n/fcitx/fcitx-4.1.0.ebuild b/app-i18n/fcitx/fcitx-4.1.1.ebuild
53 similarity index 96%
54 rename from app-i18n/fcitx/fcitx-4.1.0.ebuild
55 rename to app-i18n/fcitx/fcitx-4.1.1.ebuild
56 index 649865f..3ed2106 100644
57 --- a/app-i18n/fcitx/fcitx-4.1.0.ebuild
58 +++ b/app-i18n/fcitx/fcitx-4.1.1.ebuild
59 @@ -29,10 +29,6 @@ DEPEND="${RDEPEND}
60 x11-proto/xproto
61 dev-util/pkgconfig"
62
63 -src_prepare() {
64 - epatch "${FILESDIR}/${P}-fix-ldflags.patch"
65 -}
66 -
67 src_configure() {
68 local mycmakeargs="
69 $(cmake-utils_use_enable cairo)
70
71 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
72 deleted file mode 100644
73 index 0ca5097..0000000
74 --- a/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch
75 +++ /dev/null
76 @@ -1,18 +0,0 @@
77 -diff -r f6cd2db5d10f -r faf8d566e65f CMakeLists.txt
78 ---- a/CMakeLists.txt Sat Sep 03 13:01:35 2011 +0800
79 -+++ b/CMakeLists.txt Sat Sep 03 17:20:16 2011 +0800
80 -@@ -126,10 +126,10 @@
81 - set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir})
82 - set(FCITX4_PACKAGE_NAME ${package})
83 -
84 --set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden")
85 --set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden")
86 --set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed")
87 --set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed")
88 -+set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
89 -+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
90 -+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
91 -+set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
92 - add_definitions("-D_GNU_SOURCE -DFCITX_HAVE_CONFIG_H")
93 -
94 - configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)