diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2020-11-11 05:00:00 +0000 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2020-11-11 15:20:53 -0500 |
| commit | 87e5eed5e2cf8ac1c53fab1e87ef2ed502b4ea7d (patch) | |
| tree | 8e0d5838414c1909e4422630b0fb8ef8d7cc8686 /app-i18n/fcitx | |
| parent | app-i18n/fcitx: Version bump (4.2.9.8). (diff) | |
| download | gentoo-87e5eed5e2cf8ac1c53fab1e87ef2ed502b4ea7d.tar.gz gentoo-87e5eed5e2cf8ac1c53fab1e87ef2ed502b4ea7d.tar.bz2 gentoo-87e5eed5e2cf8ac1c53fab1e87ef2ed502b4ea7d.zip | |
app-i18n/fcitx: Fix detection of Enchant >=2.1.3.
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.8.ebuild | 1 | ||||
| -rw-r--r-- | app-i18n/fcitx/fcitx-4.9999.ebuild | 1 | ||||
| -rw-r--r-- | app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch | 32 |
3 files changed, 34 insertions, 0 deletions
diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild index 6c50695a8919..445151b051e5 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 bd7bc5be7941..3cb6e63cdc78 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 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 <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, |