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,
