From a4ca873baa42a34e97904d7f9314b6a06d270f85 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 6 Nov 2021 22:53:23 +0100 Subject: [PATCH 1/2] fcitx: use enchant2. --- srcpkgs/fcitx/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template index 1bcb6bee3523..af75f701ca59 100644 --- a/srcpkgs/fcitx/template +++ b/srcpkgs/fcitx/template @@ -6,9 +6,11 @@ build_style=cmake build_helper=gir configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF - -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)" + -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF) + -DENCHANT_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/enchant-2/ + -DENCHANT_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libenchant-2.so" hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel" -makedepends="iso-codes gettext-devel enchant-devel libxml2-devel +makedepends="iso-codes gettext-devel enchant2-devel libxml2-devel json-c-devel opencc-devel libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel" depends="fcitx5-icons fcitx5-chinese-addons-icons" @@ -37,6 +39,8 @@ pre_configure() { vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \ cmake/FcitxConfig.cmake + vsed -i -e 's;enchant/enchant.h;enchant-2/enchant.h;' cmake/FindEnchant.cmake + if [ "$CROSS_BUILD" ]; then # use host binaries vsed -i -e 's;${PROJECT_BINARY_DIR}/tools/dev;/usr/lib/fcitx/libexec;' \ From 277f3526a10b2d84d5a5ab75f942abb0b1c8ec4f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 6 Nov 2021 22:54:41 +0100 Subject: [PATCH 2/2] enchant: removed, obsoleted by enchant2. Closes #27710. --- common/shlibs | 1 - srcpkgs/enchant-devel | 1 - .../enchant/patches/hunspell14_buildfix.diff | 14 --------- srcpkgs/enchant/template | 31 ------------------- 4 files changed, 47 deletions(-) delete mode 120000 srcpkgs/enchant-devel delete mode 100644 srcpkgs/enchant/patches/hunspell14_buildfix.diff delete mode 100644 srcpkgs/enchant/template diff --git a/common/shlibs b/common/shlibs index 1011051af4d4..9664f48a6514 100644 --- a/common/shlibs +++ b/common/shlibs @@ -523,7 +523,6 @@ libicuuc.so.69 icu-libs-69.1_1 libicutest.so.69 icu-libs-69.1_1 libaspell.so.15 libaspell-0.60.8_2 libpspell.so.15 libaspell-0.60.8_2 -libenchant.so.1 enchant-1.4.2_1 libenchant-2.so.2 enchant2-2.2.3_1 libgconf-2.so.4 GConf-2.32.0_1 libpackagekit-glib2.so.18 PackageKit-1.1.12_1 diff --git a/srcpkgs/enchant-devel b/srcpkgs/enchant-devel deleted file mode 120000 index 58fecba7d86d..000000000000 --- a/srcpkgs/enchant-devel +++ /dev/null @@ -1 +0,0 @@ -enchant \ No newline at end of file diff --git a/srcpkgs/enchant/patches/hunspell14_buildfix.diff b/srcpkgs/enchant/patches/hunspell14_buildfix.diff deleted file mode 100644 index 0ecdb24b30cf..000000000000 --- a/srcpkgs/enchant/patches/hunspell14_buildfix.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru enchant-1.6.0-orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp ---- enchant-1.6.0-orig/src/myspell/myspell_checker.cpp 2016-04-18 12:25:00.094614256 +0100 -+++ enchant-1.6.0/src/myspell/myspell_checker.cpp 2016-04-18 12:26:09.108569576 +0100 -@@ -148,6 +148,10 @@ - g_iconv_close(m_translate_out); - } - -+#ifndef MAXWORDLEN -+# define MAXWORDLEN 100 -+#endif -+ - bool - MySpellChecker::checkWord(const char *utf8Word, size_t len) - { diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template deleted file mode 100644 index 69458ae39180..000000000000 --- a/srcpkgs/enchant/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'enchant' -pkgname=enchant -version=1.6.0 -revision=8 -build_style=gnu-configure -configure_args="--disable-zemberek --disable-ispell --disable-aspell - --with-myspell-dir=/usr/share/hunspell" -hostmakedepends="automake libtool pkg-config" -makedepends="glib-devel hunspell-devel" -short_desc="Generic spell checking library" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://www.abisource.com/projects/enchant/" -distfiles="http://www.abisource.com/downloads/enchant/${version}/enchant-${version}.tar.gz" -checksum=2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f - -pre_configure() { - autoreconf -fi -} - -enchant-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/enchant/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -}