* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/
@ 2016-04-28 21:07 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2016-04-28 21:07 UTC (permalink / raw
To: gentoo-commits
commit: af049eaa17f978c830c05745e3667a05056805a5
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 28 20:15:56 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 21:06:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af049eaa
app-i18n/fcitx: Delete old version.
app-i18n/fcitx/Manifest | 1 -
app-i18n/fcitx/fcitx-4.2.7.ebuild | 125 ---------------------
.../fcitx/files/fcitx-4.2.7-gcc46-compatible.patch | 43 -------
app-i18n/fcitx/metadata.xml | 1 -
4 files changed, 170 deletions(-)
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 8e7d3bf..58b4baf 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,3 @@
-DIST fcitx-4.2.7_dict.tar.xz 8546416 SHA256 0c902617581f04eb0d337634b0bf2b39956abbcc949512cc79d4ee24cfc9dbb5 SHA512 e5d8eb55f644250197e69315ad02b9f6bc84e697b23c20c01a731f98ce8b1a16d764a58b1e1047d45b8decb6be33144707c2a52fc427e6338d8b8186cd4da074 WHIRLPOOL e344bc92a84940d3c885d1ae87a2fc83c95d6cb0f0e95eed76078e996c4a00df82a0c09c4540771f628928db1716f90d50d04469f2c0f2d5c17b5048fbf2d482
DIST fcitx-4.2.8.5_dict.tar.xz 8696468 SHA256 fe3d6f57805fc61130f8254f19a86fe3baa0f405406414ca2e94bcf86d3d1b72 SHA512 ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe WHIRLPOOL 0a394d5aaa53819bbab66b32e7ae5896187bc45fad146c7eef4ab75640e5c6670cf811bec87e482bb3516b30e1ce28f2cefa91c10838092f9329b1101b5c70db
DIST fcitx-4.2.8.6_dict.tar.xz 8694328 SHA256 91034e9ef976bbe2649a96b67adf0c133d64e2c0d53be440cc40a4370569d597 SHA512 822e448932e735fe3087384eaf91c6b029b06d3461aa3798501bfbf8f79b8ebc5ea3ac57f01ec32674cc3cb74fcb34b6e285ef265bb49be54543f34dcaf624e4 WHIRLPOOL df24b3b6bbe18a8498732b27817caef6c28278bddd6acfbe49edd9a63d8f33b09ba93ff0bd144e1c1d3b9b9c8079a35a8a047ebf9b361b4f173ec9b23138042e
DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
diff --git a/app-i18n/fcitx/fcitx-4.2.7.ebuild b/app-i18n/fcitx/fcitx-4.2.7.ebuild
deleted file mode 100644
index dfff4f9..0000000
--- a/app-i18n/fcitx/fcitx-4.2.7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils gnome2-utils fdo-mime multilib readme.gentoo
-
-DESCRIPTION="Flexible Contect-aware Input Tool with eXtension support"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}_dict.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
-nls opencc +pango qt4 snooper static-libs +table test +xml"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXinerama
- )
- cairo? (
- x11-libs/cairo[X]
- pango? ( x11-libs/pango[X] )
- !pango? ( media-libs/fontconfig )
- )
- dbus? ( sys-apps/dbus )
- enchant? ( app-text/enchant )
- gtk? (
- x11-libs/gtk+:2
- dev-libs/glib:2
- dev-libs/dbus-glib
- )
- gtk3? (
- x11-libs/gtk+:3
- dev-libs/glib:2
- dev-libs/dbus-glib
- )
- icu? ( dev-libs/icu:= )
- introspection? ( dev-libs/gobject-introspection )
- lua? ( dev-lang/lua )
- opencc? ( app-i18n/opencc )
- qt4? (
- dev-qt/qtdbus:4
- dev-qt/qtgui:4[glib]
- )
- xml? (
- app-text/iso-codes
- dev-libs/libxml2
- x11-libs/libxkbfile
- )"
-DEPEND="${RDEPEND}
- virtual/libintl
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO
- doc/pinyin.txt doc/cjkvinput.txt doc/API.txt doc/Develop_Readme )
-HTML_DOCS=( doc/wb_fh.htm )
-
-src_prepare() {
- use autostart && DOC_CONTENTS="You have enabled the autostart USE flag,
- which will let fcitx start automatically on XDG compatible desktop
- environments, such as Gnome, KDE, LXDE, Razor-qt and Xfce. If you use
- ~/.xinitrc to configure your desktop, make sure to include the fcitx
- command to start it."
- epatch "${FILESDIR}/${P}-gcc46-compatible.patch"
- epatch_user
-}
-
-src_configure() {
- local mycmakeargs="
- -DLIB_INSTALL_DIR=/usr/$(get_libdir)
- $(cmake-utils_use_enable X X11)
- $(cmake-utils_use_enable autostart XDGAUTOSTART)
- $(cmake-utils_use_enable cairo CAIRO)
- $(cmake-utils_use_enable dbus DBUS)
- $(cmake-utils_use_enable debug DEBUG)
- $(cmake-utils_use_enable enchant ENCHANT)
- $(cmake-utils_use_enable gtk GTK2_IM_MODULE)
- $(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
- $(cmake-utils_use_enable icu ICU)
- $(cmake-utils_use_enable introspection GIR)
- $(cmake-utils_use_enable lua LUA)
- $(cmake-utils_use_enable nls GETTEXT)
- $(cmake-utils_use_enable opencc OPENCC)
- $(cmake-utils_use_enable pango PANGO)
- $(cmake-utils_use_enable qt4 QT)
- $(cmake-utils_use_enable qt4 QT_IM_MODULE)
- $(cmake-utils_use_enable qt4 QT_GUI)
- $(cmake-utils_use_enable snooper SNOOPER)
- $(cmake-utils_use_enable static-libs STATIC)
- $(cmake-utils_use_enable table TABLE)
- $(cmake-utils_use_enable test TEST)
- $(cmake-utils_use_enable xml LIBXML2)"
- if use gtk || use gtk3 || use qt4 ; then
- mycmakeargs+=" -DENABLE_GLIB2=ON "
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -rf "${ED}"/usr/share/doc/${PN} || die
- use autostart && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- use gtk && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
- use autostart && readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- use gtk && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch b/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
deleted file mode 100644
index 218f0e8..0000000
--- a/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4c703e395b55e939f3ac1e4a4bf5cd36aa5b0abc Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 26 Jan 2013 14:40:00 -0500
-Subject: [PATCH] [fcitx] fix compatible with gcc 4.6
-
----
- src/lib/fcitx/module.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/fcitx/module.h b/src/lib/fcitx/module.h
-index 28de64f..bae6601 100644
---- a/src/lib/fcitx/module.h
-+++ b/src/lib/fcitx/module.h
-@@ -109,7 +109,7 @@
- void* FcitxModuleInvokeFunction(FcitxAddon* addon, int functionId, FcitxModuleFunctionArg args);
- #define FcitxModuleInvokeVaArgs(addon, functionId, ARGV...) \
- (FcitxModuleInvokeFunction(addon, functionId, \
-- (FcitxModuleFunctionArg){ .args = {ARGV} }))
-+ (FcitxModuleFunctionArg){ {ARGV} }))
-
- /**
- * invoke inter module function with addon name, returns NULL when fails (the function itself can also return NULL)
-@@ -133,7 +133,7 @@
- #define InvokeVaArgs(INST, MODULE, FUNC, ARGV...) \
- ((MODULE##_##FUNC##_RETURNTYPE)FcitxModuleInvokeFunctionByName( \
- INST, MODULE##_NAME, MODULE##_##FUNC, \
-- (FcitxModuleFunctionArg){ .args = {ARGV} }))
-+ (FcitxModuleFunctionArg){ {ARGV} }))
-
- /** add a function to a addon */
- #define AddFunction(ADDON, Realname) \
-@@ -215,7 +215,7 @@
- }
-
- #define FCITX_DEF_MODULE_ARGS(var, ARGV...) \
-- FcitxModuleFunctionArg var = { .args = {ARGV} }
-+ FcitxModuleFunctionArg var = { {ARGV} }
- /* void *__##var##_array[] = {ARGV}; \ */
- /* size_t __##var##_length = sizeof(__##var##_array) / sizeof(void*); \ */
- /* FcitxModuleFunctionArg var[] = { { .n = __##var##_length, \ */
---
-1.7.10
-
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 11e641c..57a8af8 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -18,7 +18,6 @@
<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
<flag name="qt4">Install input method module for Qt 4</flag>
- <flag name="snooper">Enable key snooper for GTK+ applications</flag>
<flag name="table">Install table input methods for Simplified Chinese</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/
@ 2017-09-21 21:06 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2017-09-21 21:06 UTC (permalink / raw
To: gentoo-commits
commit: f0d71731a2377324deec959a9f5878d2eb6f9aa2
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Sep 21 18:48:11 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 21:03:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d71731
app-i18n/fcitx: Version bump (4.2.9.3).
app-i18n/fcitx/Manifest | 1 +
app-i18n/fcitx/fcitx-4.2.9.3.ebuild | 147 +++++++++++++++++++++++
app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch | 13 ++
3 files changed, 161 insertions(+)
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 999afcc2b9c..8392668a8fb 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,5 +1,6 @@
DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
+DIST fcitx-4.2.9.3_dict.tar.xz 8737864 SHA256 543cc301f274367429880cb80c53349ed44435e7c64d757cca9b0d1844e2a91e SHA512 813b55c4b13e9d36bdaed6e4d072a841aa7f067f937b46d1fdbc03e8176b76ce83b056e24e2c0fe944f1347c5fe6a8d9bfdd6b0b2ed054e3017f3926fa36bcdd WHIRLPOOL b54c52025a48350c37712a64048ae2cec4e891c75607ded8ce35940252d2c242430e6ff0e64c86e1319b89b57b388c05760728a861cd58af0c99edd634f20c97
DIST fcitx-data-en_dict-20121020.tar.gz 630491 SHA256 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 WHIRLPOOL 858b51723035e24756c0ece15ee28f9d25dbc86ca447c50e070f085e47b864f26201a100d3d968bcecf5711e76f99c7908eeabe7bc6d5b3b17d6cf2c53c3204b
DIST fcitx-data-pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
DIST fcitx-data-py_stroke-20121124.tar.gz 445601 SHA256 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 WHIRLPOOL 3b09c21b8f948538b10218bd52ed12235f8d8a1986db7c09a35de5454c89305d5ada27177c8501b6bf72324aa1824a384822a7fbb440d63ce081265b1fa34c65
diff --git a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
new file mode 100644
index 00000000000..6a1c4258963
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
+ https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
+ https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
+ https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
+ https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
+else
+ SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2+ MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+
+RDEPEND="dev-libs/glib:2
+ sys-apps/dbus
+ virtual/libiconv
+ virtual/libintl
+ x11-libs/libxkbcommon
+ X? (
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libXinerama
+ x11-libs/libXrender
+ xml? (
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ )
+ )
+ cairo? (
+ x11-libs/cairo[X]
+ x11-libs/libXext
+ pango? ( x11-libs/pango )
+ !pango? ( media-libs/fontconfig )
+ )
+ enchant? ( app-text/enchant:0= )
+ gtk2? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ introspection? ( dev-libs/gobject-introspection )
+ lua? ( dev-lang/lua:= )
+ nls? ( sys-devel/gettext )
+ opencc? ( app-i18n/opencc:= )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ )
+ xml? (
+ app-text/iso-codes
+ dev-libs/libxml2
+ )"
+DEPEND="${RDEPEND}
+ kde-frameworks/extra-cmake-modules:5
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-restart.patch"
+)
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+src_prepare() {
+ if [[ "${PV}" == "9999" ]]; then
+ ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
+ ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
+ ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
+ ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
+ ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
+ fi
+
+ # https://github.com/fcitx/fcitx/issues/250
+ sed \
+ -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
+ -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
+ -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
+ -i CMakeLists.txt
+
+ cmake-utils_src_prepare
+ xdg_environment_reset
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ -DSYSCONFDIR="${EPREFIX}/etc"
+ -DENABLE_CAIRO=$(usex cairo)
+ -DENABLE_DEBUG=$(usex debug)
+ -DENABLE_ENCHANT=$(usex enchant)
+ -DENABLE_GETTEXT=$(usex nls)
+ -DENABLE_GIR=$(usex introspection)
+ -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+ -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+ -DENABLE_LIBXML2=$(usex xml)
+ -DENABLE_LUA=$(usex lua)
+ -DENABLE_OPENCC=$(usex opencc)
+ -DENABLE_PANGO=$(usex pango)
+ -DENABLE_QT=$(usex qt4)
+ -DENABLE_QT_GUI=$(usex qt4)
+ -DENABLE_QT_IM_MODULE=$(usex qt4)
+ -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+ -DENABLE_STATIC=$(usex static-libs)
+ -DENABLE_TABLE=$(usex table)
+ -DENABLE_TEST=$(usex test)
+ -DENABLE_X11=$(usex X)
+ -DENABLE_XDGAUTOSTART=$(usex autostart)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ use gtk2 && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ use gtk2 && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
+}
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
new file mode 100644
index 00000000000..b71bdac9461
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
@@ -0,0 +1,13 @@
+https://github.com/fcitx/fcitx/issues/362
+https://github.com/fcitx/fcitx/commit/82202f6b81361263693f07ae17c55c8ce048b220
+
+--- /src/lib/fcitx/instance.c
++++ /src/lib/fcitx/instance.c
+@@ -365,6 +365,7 @@
+ setjmp(FcitxRecover);
+
+ if (instance->destroy || instance->restart) {
++ FcitxInstanceEnd(instance);
+ FcitxInstanceRealEnd(instance);
+ break;
+ }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/
@ 2020-11-11 20:21 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2020-11-11 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 87e5eed5e2cf8ac1c53fab1e87ef2ed502b4ea7d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Nov 11 05:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 20:20:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e5eed5
app-i18n/fcitx: Fix detection of Enchant >=2.1.3.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 1 +
app-i18n/fcitx/fcitx-4.9999.ebuild | 1 +
app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch | 32 ++++++++++++++++++++++++
3 files changed, 34 insertions(+)
diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index 6c50695a891..445151b051e 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
@@ -72,6 +72,7 @@ DEPEND="dev-libs/glib:2
RDEPEND="${DEPEND}"
PATCHES=(
+ "${FILESDIR}/${PN}-4.2.9.8-enchant.patch"
"${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
)
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index bd7bc5be794..3cb6e63cdc7 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -72,6 +72,7 @@ DEPEND="dev-libs/glib:2
RDEPEND="${DEPEND}"
PATCHES=(
+ "${FILESDIR}/${PN}-4.2.9.8-enchant.patch"
"${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
)
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
new file mode 100644
index 00000000000..f152f1dc6e5
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
@@ -0,0 +1,32 @@
+https://github.com/fcitx/fcitx/issues/475
+
+--- /cmake/FindEnchant.cmake
++++ /cmake/FindEnchant.cmake
+@@ -16,15 +16,15 @@
+ endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
+ find_package(PkgConfig)
+-pkg_check_modules(PC_ENCHANT enchant)
++pkg_check_modules(PC_ENCHANT enchant-2 enchant)
+
+ find_path(ENCHANT_INCLUDE_DIR
+ NAMES enchant.h
+ HINTS ${PC_ENCHANT_INCLUDE_DIRS}
+- PATH_SUFFIXES "enchant")
++ PATH_SUFFIXES enchant-2 enchant)
+
+ find_library(ENCHANT_LIBRARIES
+- NAMES enchant
++ NAMES enchant-2 enchant
+ HINTS ${PC_ENCHANT_LIBRARY_DIRS})
+
+ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+@@ -39,7 +39,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
+- #include <enchant/enchant.h>
++ #include <enchant.h>
+
+ EnchantBroker *enchant_broker_init();
+ char **enchant_dict_suggest(EnchantDict *dict, const char *str,
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/
@ 2024-08-15 20:35 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-08-15 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 04d15160b358179c5dabf2a1e142df6d541eef47
Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Thu Aug 15 05:56:58 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 20:34:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d15160
app-i18n/fcitx: fix missing cstdint for GCC 15
Closes: https://bugs.gentoo.org/937737
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/fcitx/fcitx-5.1.10-r1.ebuild | 127 +++++++++++++++++++++
.../fcitx-5.1.10-include-cstdint-for-gcc-15.patch | 12 ++
2 files changed, 139 insertions(+)
diff --git a/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild b/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild
new file mode 100644
index 000000000000..13e9dd85807e
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5"
+
+inherit cmake unpacker xdg
+
+DESCRIPTION="Fcitx 5 is a generic input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"
+SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+LICENSE="LGPL-2+ Unicode-DFS-2016"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X"
+REQUIRED_USE="
+ || ( wayland X )
+ X? ( keyboard )
+ wayland? ( keyboard )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !app-i18n/fcitx:4
+ dev-libs/libfmt
+ sys-devel/gettext
+ virtual/libintl
+ x11-libs/cairo[X?]
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango[X?]
+ doc? (
+ app-text/doxygen
+ dev-texlive/texlive-fontutils
+ )
+ emoji? ( sys-libs/zlib )
+ enchant? ( app-text/enchant:2 )
+ keyboard? (
+ app-text/iso-codes
+ dev-libs/expat
+ dev-libs/json-c:=
+ x11-misc/xkeyboard-config
+ x11-libs/libxkbcommon[X?,wayland?]
+ )
+ systemd? (
+ sys-apps/systemd
+ )
+ !systemd? (
+ dev-libs/libuv
+ sys-apps/dbus
+ )
+ wayland? (
+ dev-libs/glib:2
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ dev-util/wayland-scanner
+ )
+ X? (
+ dev-libs/glib:2
+ >=x11-libs/xcb-imdkit-1.0.3:5
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ x11-libs/xcb-util
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ kde-frameworks/extra-cmake-modules:0
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-include-cstdint-for-gcc-15.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DBUS=on
+ -DENABLE_XDGAUTOSTART=$(usex autostart)
+ -DENABLE_SERVER=$(usex server)
+ -DENABLE_KEYBOARD=$(usex keyboard)
+ -DENABLE_TEST=$(usex test)
+ -DENABLE_ENCHANT=$(usex enchant)
+ -DENABLE_EMOJI=$(usex emoji)
+ -DENABLE_PRESAGE=$(usex presage)
+ -DENABLE_WAYLAND=$(usex wayland)
+ -DENABLE_X11=$(usex X)
+ -DENABLE_DOC=$(usex doc)
+ -DUSE_SYSTEMD=$(usex systemd)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc
+}
+
+src_install() {
+ cmake_src_install
+ use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
+
+src_test() {
+ # break by sandbox
+ local CMAKE_SKIP_TESTS=(
+ testdbus
+ testservicewatcher
+ )
+ cmake_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog
+ elog "Follow the instrcutions on:"
+ elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx"
+ elog "https://fcitx-im.org/wiki/Setup_Fcitx_5"
+ elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland"
+ elog
+}
diff --git a/app-i18n/fcitx/files/fcitx-5.1.10-include-cstdint-for-gcc-15.patch b/app-i18n/fcitx/files/fcitx-5.1.10-include-cstdint-for-gcc-15.patch
new file mode 100644
index 000000000000..4dcf19d363de
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-5.1.10-include-cstdint-for-gcc-15.patch
@@ -0,0 +1,12 @@
+https://github.com/fcitx/fcitx5/pull/1119
+
+--- a/src/lib/fcitx-utils/inputbuffer.h
++++ b/src/lib/fcitx-utils/inputbuffer.h
+@@ -7,6 +7,7 @@
+ #ifndef _FCITX_UTILS_INPUTBUFFER_H_
+ #define _FCITX_UTILS_INPUTBUFFER_H_
+
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <string>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-15 20:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-15 20:35 [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-11-11 20:21 Mike Gilbert
2017-09-21 21:06 Mike Gilbert
2016-04-28 21:07 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox