[PR PATCH] Remove enchant.

[PR PATCH] Remove enchant.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages rip-enchant
https://github.com/void-linux/void-packages/pull/33931

Remove enchant.
After fcitx uses enchant2-devel, enchant is unused and can be removed. Closes #27710.

cc @sgn, why doesnt fcitx have shlib depends on enchant?

A patch file from https://github.com/void-linux/void-packages/pull/33931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rip-enchant-33931.patch --]
[-- Type: text/x-diff, Size: 4830 bytes --]

From a4ca873baa42a34e97904d7f9314b6a06d270f85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
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 <leah@vuxu.org>
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 <orphan@voidlinux.org>"
-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
-	}
-}

Re: Remove enchant.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/33931#issuecomment-962522746

Comment:
revbump fcitx?

Re: [PR PATCH] [Updated] Remove enchant.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages rip-enchant
https://github.com/void-linux/void-packages/pull/33931

Remove enchant.
After fcitx uses enchant2-devel, enchant is unused and can be removed. Closes #27710.

cc @sgn, why doesnt fcitx have shlib depends on enchant?

A patch file from https://github.com/void-linux/void-packages/pull/33931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rip-enchant-33931.patch --]
[-- Type: text/x-diff, Size: 4920 bytes --]

From 05862e208addaeee6b3f6d71c77efe9bedc80c07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Nov 2021 22:53:23 +0100
Subject: [PATCH 1/2] fcitx: use enchant2.

---
 srcpkgs/fcitx/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 1bcb6bee3523..590f93109621 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,14 +1,16 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.8
-revision=4
+revision=5
 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 aa5598b125015a771a1fdb46d62e102a41cb3026 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
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 <orphan@voidlinux.org>"
-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
-	}
-}

Re: [PR PATCH] [Merged]: Remove enchant.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

There's a merged pull request on the void-packages repository

Remove enchant.
https://github.com/void-linux/void-packages/pull/33931

Description:
After fcitx uses enchant2-devel, enchant is unused and can be removed. Closes #27710.

cc @sgn, why doesnt fcitx have shlib depends on enchant?