Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/
Date: Thu, 21 Sep 2017 21:06:13
Message-Id: 1506027837.f0d71731a2377324deec959a9f5878d2eb6f9aa2.floppym@gentoo
1 commit: f0d71731a2377324deec959a9f5878d2eb6f9aa2
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Thu Sep 21 18:48:11 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 21 21:03:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d71731
7
8 app-i18n/fcitx: Version bump (4.2.9.3).
9
10 app-i18n/fcitx/Manifest | 1 +
11 app-i18n/fcitx/fcitx-4.2.9.3.ebuild | 147 +++++++++++++++++++++++
12 app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch | 13 ++
13 3 files changed, 161 insertions(+)
14
15 diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
16 index 999afcc2b9c..8392668a8fb 100644
17 --- a/app-i18n/fcitx/Manifest
18 +++ b/app-i18n/fcitx/Manifest
19 @@ -1,5 +1,6 @@
20 DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
21 DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
22 +DIST fcitx-4.2.9.3_dict.tar.xz 8737864 SHA256 543cc301f274367429880cb80c53349ed44435e7c64d757cca9b0d1844e2a91e SHA512 813b55c4b13e9d36bdaed6e4d072a841aa7f067f937b46d1fdbc03e8176b76ce83b056e24e2c0fe944f1347c5fe6a8d9bfdd6b0b2ed054e3017f3926fa36bcdd WHIRLPOOL b54c52025a48350c37712a64048ae2cec4e891c75607ded8ce35940252d2c242430e6ff0e64c86e1319b89b57b388c05760728a861cd58af0c99edd634f20c97
23 DIST fcitx-data-en_dict-20121020.tar.gz 630491 SHA256 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 WHIRLPOOL 858b51723035e24756c0ece15ee28f9d25dbc86ca447c50e070f085e47b864f26201a100d3d968bcecf5711e76f99c7908eeabe7bc6d5b3b17d6cf2c53c3204b
24 DIST fcitx-data-pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
25 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 SHA256 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 WHIRLPOOL 3b09c21b8f948538b10218bd52ed12235f8d8a1986db7c09a35de5454c89305d5ada27177c8501b6bf72324aa1824a384822a7fbb440d63ce081265b1fa34c65
26
27 diff --git a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
28 new file mode 100644
29 index 00000000000..6a1c4258963
30 --- /dev/null
31 +++ b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
32 @@ -0,0 +1,147 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="6"
37 +
38 +inherit cmake-utils gnome2-utils xdg-utils
39 +
40 +if [[ "${PV}" == "9999" ]]; then
41 + inherit git-r3
42 +
43 + EGIT_REPO_URI="https://github.com/fcitx/fcitx"
44 +fi
45 +
46 +DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
47 +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
48 +if [[ "${PV}" == "9999" ]]; then
49 + SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
50 + https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
51 + https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
52 + https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
53 + https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
54 +else
55 + SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
56 +fi
57 +
58 +LICENSE="GPL-2+ LGPL-2+ MIT"
59 +SLOT="4"
60 +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
61 +IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
62 +REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
63 +
64 +RDEPEND="dev-libs/glib:2
65 + sys-apps/dbus
66 + virtual/libiconv
67 + virtual/libintl
68 + x11-libs/libxkbcommon
69 + X? (
70 + x11-libs/libX11
71 + x11-libs/libXfixes
72 + x11-libs/libXinerama
73 + x11-libs/libXrender
74 + xml? (
75 + x11-libs/libxkbfile
76 + x11-misc/xkeyboard-config
77 + )
78 + )
79 + cairo? (
80 + x11-libs/cairo[X]
81 + x11-libs/libXext
82 + pango? ( x11-libs/pango )
83 + !pango? ( media-libs/fontconfig )
84 + )
85 + enchant? ( app-text/enchant:0= )
86 + gtk2? ( x11-libs/gtk+:2 )
87 + gtk3? ( x11-libs/gtk+:3 )
88 + introspection? ( dev-libs/gobject-introspection )
89 + lua? ( dev-lang/lua:= )
90 + nls? ( sys-devel/gettext )
91 + opencc? ( app-i18n/opencc:= )
92 + qt4? (
93 + dev-qt/qtcore:4
94 + dev-qt/qtdbus:4
95 + dev-qt/qtgui:4
96 + )
97 + xml? (
98 + app-text/iso-codes
99 + dev-libs/libxml2
100 + )"
101 +DEPEND="${RDEPEND}
102 + kde-frameworks/extra-cmake-modules:5
103 + virtual/pkgconfig"
104 +
105 +PATCHES=(
106 + "${FILESDIR}/${P}-restart.patch"
107 +)
108 +
109 +DOCS=(AUTHORS ChangeLog THANKS)
110 +
111 +src_prepare() {
112 + if [[ "${PV}" == "9999" ]]; then
113 + ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
114 + ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
115 + ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
116 + ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
117 + ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
118 + fi
119 +
120 + # https://github.com/fcitx/fcitx/issues/250
121 + sed \
122 + -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
123 + -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
124 + -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
125 + -i CMakeLists.txt
126 +
127 + cmake-utils_src_prepare
128 + xdg_environment_reset
129 +}
130 +
131 +src_configure() {
132 + local mycmakeargs=(
133 + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
134 + -DSYSCONFDIR="${EPREFIX}/etc"
135 + -DENABLE_CAIRO=$(usex cairo)
136 + -DENABLE_DEBUG=$(usex debug)
137 + -DENABLE_ENCHANT=$(usex enchant)
138 + -DENABLE_GETTEXT=$(usex nls)
139 + -DENABLE_GIR=$(usex introspection)
140 + -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
141 + -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
142 + -DENABLE_LIBXML2=$(usex xml)
143 + -DENABLE_LUA=$(usex lua)
144 + -DENABLE_OPENCC=$(usex opencc)
145 + -DENABLE_PANGO=$(usex pango)
146 + -DENABLE_QT=$(usex qt4)
147 + -DENABLE_QT_GUI=$(usex qt4)
148 + -DENABLE_QT_IM_MODULE=$(usex qt4)
149 + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
150 + -DENABLE_STATIC=$(usex static-libs)
151 + -DENABLE_TABLE=$(usex table)
152 + -DENABLE_TEST=$(usex test)
153 + -DENABLE_X11=$(usex X)
154 + -DENABLE_XDGAUTOSTART=$(usex autostart)
155 + )
156 +
157 + cmake-utils_src_configure
158 +}
159 +
160 +src_install() {
161 + cmake-utils_src_install
162 + rm -r "${ED}usr/share/doc/${PN}"
163 +}
164 +
165 +pkg_postinst() {
166 + gnome2_icon_cache_update
167 + xdg_desktop_database_update
168 + xdg_mimeinfo_database_update
169 + use gtk2 && gnome2_query_immodules_gtk2
170 + use gtk3 && gnome2_query_immodules_gtk3
171 +}
172 +
173 +pkg_postrm() {
174 + gnome2_icon_cache_update
175 + xdg_desktop_database_update
176 + xdg_mimeinfo_database_update
177 + use gtk2 && gnome2_query_immodules_gtk2
178 + use gtk3 && gnome2_query_immodules_gtk3
179 +}
180
181 diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
182 new file mode 100644
183 index 00000000000..b71bdac9461
184 --- /dev/null
185 +++ b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
186 @@ -0,0 +1,13 @@
187 +https://github.com/fcitx/fcitx/issues/362
188 +https://github.com/fcitx/fcitx/commit/82202f6b81361263693f07ae17c55c8ce048b220
189 +
190 +--- /src/lib/fcitx/instance.c
191 ++++ /src/lib/fcitx/instance.c
192 +@@ -365,6 +365,7 @@
193 + setjmp(FcitxRecover);
194 +
195 + if (instance->destroy || instance->restart) {
196 ++ FcitxInstanceEnd(instance);
197 + FcitxInstanceRealEnd(instance);
198 + break;
199 + }