From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-i18n/fcitx/Manifest | 12 +- app-i18n/fcitx/fcitx-4.2.9.6.ebuild | 8 +- app-i18n/fcitx/fcitx-4.2.9.7.ebuild | 143 ++++++++++++++++++++++ app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 145 +++++++++++++++++++++++ app-i18n/fcitx/fcitx-4.9999.ebuild | 28 ++--- app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch | 32 +++++ app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch | 32 +++++ app-i18n/fcitx/metadata.xml | 1 + 8 files changed, 379 insertions(+), 22 deletions(-) create mode 100644 app-i18n/fcitx/fcitx-4.2.9.7.ebuild create mode 100644 app-i18n/fcitx/fcitx-4.2.9.8.ebuild create mode 100644 app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch create mode 100644 app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch (limited to 'app-i18n/fcitx') diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index eb3a2923c3ff..862a8b109da5 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,9 +1,15 @@ +AUX fcitx-4.2.9.8-enchant.patch 855 BLAKE2B 86337ed49c8b6ceee8ac11034e89248f66a3bfbac94a19c5949e94ce9e6ab7d57367701ef7e0cfe89a06cc0a5fdf48115edb13c1da43141ac7fe7eed2723d2d6 SHA512 4d1a03793d4156d7867afbbd362086d40a62f56777428e9d5b27a36120377c69b37fbfdfc709b1ae1c9faa534769051f1eaa8c9fbbaa193b28cc24bcd155e486 +AUX fcitx-4.2.9.8-xkb.patch 794 BLAKE2B e95f44dfa529bdb2f91d31f2e6f1f94c4d0c9c08927a0fd19c544e5e5983ad0509222756bd6feeb3fb8aec1deb7a09ad85d55def1993c766b0dbb46687e0ac89 SHA512 3cb7c0267a8f758366aa09ae07596d20f3c72a4cd940f5e6c4a469fb72c3284282c883402f3ff09a1c4eb695fdd214433026b5899638e00c11cab6b168e49349 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0 +DIST fcitx-4.2.9.7_dict.tar.xz 8734508 BLAKE2B e8770a3afe902fab11325f345a128156a9e6e8c4f5e712c68a03a12282c0bc6a279968bacdb2129a243967c8fdfc6b7145f5ad13daea5bf0c5fb28332e79437e SHA512 b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b +DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9 -EBUILD fcitx-4.2.9.6.ebuild 4538 BLAKE2B 24885bb784c46556f4ae323cb1773131d41742b16dc6dca784583a285aabcd34751d69fe6cf6f99a3f455f64813fcdbf79f60a7a7eab517826f098847ac6b145 SHA512 d5275a9d6d0c5bd134a29721995e09389640954fd966b2ff9de2d205ba6642c191d50ff37dfd92da7f5ac009979740f8776a871ba570f99428aeb2bff8cc424f -EBUILD fcitx-4.9999.ebuild 4506 BLAKE2B c4e02d1bb61fdcaf57468d354c2d04b6797ae9e9b120f106ac853c818351700740323ae1c03b72a3f18ef6fc7b3864a414e923f8064f88a1879331d1695a32f0 SHA512 ae757929c401888ddb76b1f0244c53415180c95e2679a8d23282b41831d478ef87ff1a7f1086feecdba1678d89b4c057be4f4e4537bb210fed1c97976c45bc54 -MISC metadata.xml 1076 BLAKE2B 26683fedf129c5a12418a498aab7dbeee3b309b9f88a91e1038ba4f8babea80a8e1847b2b2e3d3e942fd9d3de32a97c6d7229fb97d5d91131c6a0093119d0de7 SHA512 dd819898fe67f8d746f43f02606d7a38360be1f66e6c6d33f0f81aff389018c7a988bb27304344a4107287b753a5acda3c20ad10d37f9ca859d1e948acdb2224 +EBUILD fcitx-4.2.9.6.ebuild 4538 BLAKE2B 6b2a1fb24810d3c15f19cb01b9019d0cc6147171e3160b9204d2489fe032df3151827ab141dec6075484906749abb09719a3e9e5be17d89f0bfeb49525ff7c31 SHA512 bb54ec7c4fdff72eef9233a3326afc4b8cd21d1c101c17ca903574cc487561b4b5a88ed91680aecafbaa752ee724743cdf0817fad3c2069366ce421593c38b7a +EBUILD fcitx-4.2.9.7.ebuild 4199 BLAKE2B c40ef62b59f2867329590a46eac97985b4860e5767beddf34fddbd7937b7d8370855d7cb600143e27107d6a815e4a09586d83287c329ecbf8c653dd679e26a79 SHA512 bc5bce4a291abaccaba62636861fa17c3b557314f019d7bf45e2d5d617c7be7b82854ae49d052d1eedd5993fc75f9020a346c46abd5398d1fd144b8f73c0ce6e +EBUILD fcitx-4.2.9.8.ebuild 4291 BLAKE2B 0b3540400289eb21293cdeb50556db2f1dd25f5d4a56b99125155f3b03e24dea018a18a215b1fdd7eb5a0b8263129794c02a258d0fb85fb09a6d4630ca77dabd SHA512 4144d08f64ad6f5b59538c27a104d5be2cac538d5bcc597e46efda545cd03b96e6b157b45f9a5ee3cdd0eb542a065345b64d6f05a3069192815f756630c23184 +EBUILD fcitx-4.9999.ebuild 4255 BLAKE2B 26388e143acae73274c280db530b2ca584b1157c5b9b736f57436e4203851943ff8d45d6db5562d240c90fdcc91d97aa3e457609531a9cdfd8dbe70be9a6a1af SHA512 4d8b32e04dcabe1a18ed1de7368ffafc2aa7293af16b188995585d837eb3715fcd972f5793a83f6fa8daf21ec60d366c95725c76c7694ae669429c8f1ab264ae +MISC metadata.xml 1189 BLAKE2B 027fb94416c905c2246444aadebc20230aa922a94228a870f1e99b8721ace82681fc27395e565a81f79ec088765cc2bde303d40788ba29c32727d57554aae196 SHA512 7f7f05a1716f4da573c075961a4367718defa22899e1f29f7d4bb13b0345e0b979c6a7b1e3040d0fd3f5ec03c0d4813585ae043340799d5a46cd3ede1be2bbc5 diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild index abf4e1cbdb6a..43274c9346bd 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild @@ -26,7 +26,7 @@ fi LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86" -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xkb" REQUIRED_USE="cairo? ( X ) pango? ( cairo )" RESTRICT="!test? ( test )" @@ -46,7 +46,7 @@ DEPEND="dev-libs/glib:2 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender - xml? ( + xkb? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) @@ -63,7 +63,7 @@ DEPEND="dev-libs/glib:2 lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:0= ) - xml? ( + xkb? ( app-text/iso-codes dev-libs/libxml2 )" @@ -102,7 +102,7 @@ src_configure() { -DENABLE_GIR=$(usex introspection ON OFF) -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) - -DENABLE_LIBXML2=$(usex xml ON OFF) + -DENABLE_LIBXML2=$(usex xkb ON OFF) -DENABLE_LUA=$(usex lua ON OFF) -DENABLE_OPENCC=$(usex opencc ON OFF) -DENABLE_PANGO=$(usex pango ON OFF) diff --git a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild new file mode 100644 index 000000000000..5a6d41ac6a92 --- /dev/null +++ b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild @@ -0,0 +1,143 @@ +# Copyright 2003-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake 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="BSD-1 GPL-2+ LGPL-2+ MIT" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" +REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +RESTRICT="!test? ( test )" + +BDEPEND="dev-util/glib-utils + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection ) + nls? ( sys-devel/gettext )" +DEPEND="dev-libs/glib:2 + sys-apps/dbus + sys-apps/util-linux + virtual/libiconv + virtual/libintl + x11-libs/libxkbcommon + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrender + xkb? ( + dev-libs/libxml2 + 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 ) + lua? ( dev-lang/lua:= ) + nls? ( sys-devel/gettext ) + opencc? ( app-i18n/opencc:0= ) + xkb? ( + app-text/iso-codes + dev-libs/json-c:0= + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.9.8-xkb.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 + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DSYSCONFDIR="${EPREFIX}/etc" + -DENABLE_CAIRO=$(usex cairo ON OFF) + -DENABLE_DEBUG=$(usex debug ON OFF) + -DENABLE_ENCHANT=$(usex enchant ON OFF) + -DENABLE_GETTEXT=$(usex nls ON OFF) + -DENABLE_GIR=$(usex introspection ON OFF) + -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) + -DENABLE_LUA=$(usex lua ON OFF) + -DENABLE_OPENCC=$(usex opencc ON OFF) + -DENABLE_PANGO=$(usex pango ON OFF) + -DENABLE_QT=OFF + -DENABLE_QT_GUI=OFF + -DENABLE_QT_IM_MODULE=OFF + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) + -DENABLE_TABLE=$(usex table ON OFF) + -DENABLE_TEST=$(usex test ON OFF) + -DENABLE_X11=$(usex X ON OFF) + -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) + -DENABLE_XKB=$(usex xkb ON OFF) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + rm -r "${ED}/usr/share/doc/${PN}" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + + elog + elog "Quick Phrase Editor is provided by:" + elog " app-i18n/fcitx-qt5:4" + elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild new file mode 100644 index 000000000000..0b9336e8a571 --- /dev/null +++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild @@ -0,0 +1,145 @@ +# Copyright 2003-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake 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="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )" +LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" +REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +RESTRICT="!test? ( test )" + +BDEPEND="dev-util/glib-utils + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection ) + nls? ( sys-devel/gettext )" +DEPEND="dev-libs/glib:2 + sys-apps/dbus + sys-apps/util-linux + virtual/libiconv + virtual/libintl + x11-libs/libxkbcommon + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrender + xkb? ( + dev-libs/libxml2 + 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:= ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + lua? ( dev-lang/lua:= ) + nls? ( sys-devel/gettext ) + opencc? ( app-i18n/opencc:0= ) + xkb? ( + app-text/iso-codes + dev-libs/json-c:0= + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.9.8-enchant.patch" + "${FILESDIR}/${PN}-4.2.9.8-xkb.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 + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DSYSCONFDIR="${EPREFIX}/etc" + -DENABLE_CAIRO=$(usex cairo ON OFF) + -DENABLE_DEBUG=$(usex debug ON OFF) + -DENABLE_ENCHANT=$(usex enchant ON OFF) + -DENABLE_GETTEXT=$(usex nls ON OFF) + -DENABLE_GIR=$(usex introspection ON OFF) + -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) + -DENABLE_LUA=$(usex lua ON OFF) + -DENABLE_OPENCC=$(usex opencc ON OFF) + -DENABLE_PANGO=$(usex pango ON OFF) + -DENABLE_QT=OFF + -DENABLE_QT_GUI=OFF + -DENABLE_QT_IM_MODULE=OFF + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) + -DENABLE_TABLE=$(usex table ON OFF) + -DENABLE_TEST=$(usex test ON OFF) + -DENABLE_X11=$(usex X ON OFF) + -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) + -DENABLE_XKB=$(usex xkb ON OFF) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + rm -r "${ED}/usr/share/doc/${PN}" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + + elog + elog "Quick Phrase Editor is provided by:" + elog " app-i18n/fcitx-qt5:4" + elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild index 53d5b963fa21..295d5fa08862 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -23,10 +23,11 @@ else SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" fi +# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )" LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="" -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" REQUIRED_USE="cairo? ( X ) pango? ( cairo )" RESTRICT="!test? ( test )" @@ -46,7 +47,8 @@ DEPEND="dev-libs/glib:2 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender - xml? ( + xkb? ( + dev-libs/libxml2 x11-libs/libxkbfile x11-misc/xkeyboard-config ) @@ -57,18 +59,23 @@ DEPEND="dev-libs/glib:2 pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) - enchant? ( app-text/enchant:0= ) + enchant? ( app-text/enchant:= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:0= ) - xml? ( + xkb? ( app-text/iso-codes - dev-libs/libxml2 + dev-libs/json-c:0= )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-4.2.9.8-enchant.patch" + "${FILESDIR}/${PN}-4.2.9.8-xkb.patch" +) + DOCS=(AUTHORS ChangeLog THANKS) src_prepare() { @@ -80,14 +87,6 @@ src_prepare() { 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\\ find_package(XKeyboardConfig REQUIRED)\n endif(ENABLE_X11)" \ - -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \ - -i CMakeLists.txt - cmake_src_prepare } @@ -102,7 +101,6 @@ src_configure() { -DENABLE_GIR=$(usex introspection ON OFF) -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) - -DENABLE_LIBXML2=$(usex xml ON OFF) -DENABLE_LUA=$(usex lua ON OFF) -DENABLE_OPENCC=$(usex opencc ON OFF) -DENABLE_PANGO=$(usex pango ON OFF) @@ -110,11 +108,11 @@ src_configure() { -DENABLE_QT_GUI=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) - -DENABLE_STATIC=$(usex static-libs ON OFF) -DENABLE_TABLE=$(usex table ON OFF) -DENABLE_TEST=$(usex test ON OFF) -DENABLE_X11=$(usex X ON OFF) -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) + -DENABLE_XKB=$(usex xkb ON OFF) ) cmake_src_configure 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 000000000000..f152f1dc6e5a --- /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 + #include + #include +- #include ++ #include + + EnchantBroker *enchant_broker_init(); + char **enchant_dict_suggest(EnchantDict *dict, const char *str, diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch new file mode 100644 index 000000000000..e21c3a1db7e8 --- /dev/null +++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch @@ -0,0 +1,32 @@ +https://github.com/fcitx/fcitx/issues/250 + +--- /CMakeLists.txt ++++ /CMakeLists.txt +@@ -96,12 +96,15 @@ + endif() + endif() + if (ENABLE_XKB) +- # Parse xkb xml file +- find_package(LibXml2 REQUIRED) + find_package(IsoCodes REQUIRED) +- find_package(XkbFile REQUIRED) + # Parse isocodes json + pkg_check_modules(JsonC "json-c" IMPORTED_TARGET REQUIRED) ++ if(ENABLE_X11) ++ # Parse xkb xml file ++ find_package(LibXml2 REQUIRED) ++ find_package(XkbFile REQUIRED) ++ find_package(XKeyboardConfig REQUIRED) ++ endif(ENABLE_X11) + endif (ENABLE_XKB) + if(ENABLE_PRESAGE) + find_package(Presage) +@@ -121,8 +124,6 @@ + message(FATAL_ERROR "Xkb is needed") + endif (NOT X11_Xkb_FOUND) + +-find_package(XKeyboardConfig REQUIRED) +- + endif() + + if (ENABLE_TEST) diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml index d364159f7497..ec867fe607ad 100644 --- a/app-i18n/fcitx/metadata.xml +++ b/app-i18n/fcitx/metadata.xml @@ -17,6 +17,7 @@ Enable OpenCC engine (using app-i18n/opencc) for converter between Simplified Chinese and Traditional Chinese Enable support for x11-libs/pango Install table input methods for Simplified Chinese + Enable support for XKB (required for fcitx-xkb, fcitx-xkbdbus, part of fcitx-keyboard) fcitx/fcitx -- cgit v1.2.3