summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2020-11-11 01:00:00 +0000
committerMike Gilbert <floppym@gentoo.org>2020-11-11 15:20:52 -0500
commit2d4aa3a4c3af23a6fbfc2b7550527e015c73a302 (patch)
treeebd0e01f25d9873561ef1b3bd7855b164430fb94 /app-i18n/fcitx
parentapp-i18n/fcitx-qt5: Add app-i18n/fcitx and dev-qt/{qtcore,qtdbus,qtwidgets}:5... (diff)
downloadgentoo-2d4aa3a4c3af23a6fbfc2b7550527e015c73a302.tar.gz
gentoo-2d4aa3a4c3af23a6fbfc2b7550527e015c73a302.tar.bz2
gentoo-2d4aa3a4c3af23a6fbfc2b7550527e015c73a302.zip
app-i18n/fcitx: Rename "xml" USE flag to "xkb".
https://github.com/fcitx/fcitx/commit/00a6bb364c3c24e6361faab8a6b31025e55067fa Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'app-i18n/fcitx')
-rw-r--r--app-i18n/fcitx/fcitx-4.2.9.6.ebuild8
-rw-r--r--app-i18n/fcitx/fcitx-4.9999.ebuild23
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch32
-rw-r--r--app-i18n/fcitx/metadata.xml1
4 files changed, 47 insertions, 17 deletions
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.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 53d5b963fa21..d337081465e1 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -26,7 +26,7 @@ fi
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 static-libs +table test +xkb"
REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
RESTRICT="!test? ( test )"
@@ -46,7 +46,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
)
@@ -63,12 +64,16 @@ 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
+ dev-libs/json-c:0=
)"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
+)
+
DOCS=(AUTHORS ChangeLog THANKS)
src_prepare() {
@@ -80,14 +85,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 +99,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)
@@ -115,6 +111,7 @@ src_configure() {
-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-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 @@
<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="table">Install table input methods for Simplified Chinese</flag>
+ <flag name="xkb">Enable support for XKB (required for fcitx-xkb, fcitx-xkbdbus, part of fcitx-keyboard)</flag>
</use>
<upstream>
<remote-id type="github">fcitx/fcitx</remote-id>