--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: abiword: Please witch to enchant-2 instead of enchant(1)
- From: Laurent Bigonville <bigon@debian.org>
- Date: Tue, 14 Apr 2020 16:33:35 +0200
- Message-id: <158687481502.582169.3883717596574215954.reportbug@edoras.bigon.be>
Source: abiword
Version: 3.0.2-10
Severity: important
Tags: patch
Control: block 947979 by -1
Hello,
Could you please switch from enchant(1) to the enchant-2 library?
We are trying to get rid of enchant(1) for the bullseye release.
The attached patch should fix this
Kind regards,
Laurent Bigonville
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 5.5.0-1-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8), LANGUAGE=fr_BE:fr (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: SELinux: enabled - Mode: Permissive - Policy name: refpolicy
diff -Nru abiword-3.0.2/debian/control abiword-3.0.2/debian/control
--- abiword-3.0.2/debian/control 2020-04-02 14:46:29.000000000 +0200
+++ abiword-3.0.2/debian/control 2020-04-14 15:22:12.000000000 +0200
@@ -13,7 +13,7 @@
libchamplain-gtk-0.12-dev,
libebook1.2-dev (>= 3.8.5),
libical-dev (>= 3.0),
- libenchant-dev,
+ libenchant-2-dev,
libfribidi-dev,
libgcrypt20-dev,
libgirepository1.0-dev,
diff -Nru abiword-3.0.2/debian/patches/enchant2.patch abiword-3.0.2/debian/patches/enchant2.patch
--- abiword-3.0.2/debian/patches/enchant2.patch 1970-01-01 01:00:00.000000000 +0100
+++ abiword-3.0.2/debian/patches/enchant2.patch 2020-04-14 15:24:39.000000000 +0200
@@ -0,0 +1,40 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -94,7 +94,7 @@ xp_pkgs="
+ "
+
+ # optional deps
+-enchant_req='enchant >= 1.2.0'
++enchant_req='enchant-2 >= 1.2.0'
+ gio_req='gio-2.0'
+ goffice_req='libgoffice-0.10 >= 0.10.0'
+
+--- a/src/af/xap/xp/enchant_checker.cpp
++++ b/src/af/xap/xp/enchant_checker.cpp
+@@ -127,7 +127,7 @@ EnchantChecker::_suggestWord (const UT_U
+ pvSugg->addItem (ucszSugg);
+ }
+
+- enchant_dict_free_suggestions (m_dict, suggestions);
++ enchant_dict_free_string_list (m_dict, suggestions);
+ }
+
+ return pvSugg;
+@@ -139,7 +139,7 @@ bool EnchantChecker::addToCustomDict (co
+
+ if (word && len) {
+ UT_UTF8String utf8 (word, len);
+- enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
++ enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
+ return true;
+ }
+ return false;
+@@ -150,7 +150,7 @@ bool EnchantChecker::isIgnored (const UT
+ UT_return_val_if_fail (m_dict, false);
+
+ UT_UTF8String ignore (toCorrect, toCorrectLen);
+- return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
++ return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+ }
+
+ void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)
diff -Nru abiword-3.0.2/debian/patches/series abiword-3.0.2/debian/patches/series
--- abiword-3.0.2/debian/patches/series 2020-04-02 14:46:29.000000000 +0200
+++ abiword-3.0.2/debian/patches/series 2020-04-14 15:21:47.000000000 +0200
@@ -11,3 +11,4 @@
libical3.diff
build-Don-t-check-for-libecal.patch
git_build_fix.patch
+enchant2.patch
--- End Message ---
--- Begin Message ---
Source: abiword
Source-Version: 3.0.2-11
Done: Jonas Smedegaard <dr@jones.dk>
We believe that the bug you reported is fixed in the latest version of
abiword, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 956710@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <dr@jones.dk> (supplier of updated abiword package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 05 Jun 2020 23:34:03 +0200
Source: abiword
Architecture: source
Version: 3.0.2-11
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <dr@jones.dk>
Changed-By: Jonas Smedegaard <dr@jones.dk>
Closes: 740678 956710
Changes:
abiword (3.0.2-11) unstable; urgency=medium
.
* adopt package: add myself as Maintainer;
closes: bug#740678, thanks to Dmitry Smirnov for past work
* update git-buildpackage config:
+ enable pristine-tar
+ stop disable merge
+ enable signed tags
+ filter-out any .git* file
+ use DEP14 branch naming scheme
* watch:
+ track Github mirror
+ rewrite usage comment
* use debhelper compatibility level 12 (not 9);
build-depend on debhelper-compat dh-sequence-gir
(not debhelper gobject-introspection)
* copyright:
+ unfuzz copyright holders
+ update and extend coverage
* tidy patch metadata
* add patch to use enchat2 instead of enchant;
build-depend on libenchant-2-dev (not libenchant-dev);
closes: bug#956710, thankt to Laurent Bigonville
Checksums-Sha1:
6948c303b82438bff406b51f54caf641d12c2be5 2915 abiword_3.0.2-11.dsc
e69938b20e3c7d8a619d4025368345037f9ddf32 67440 abiword_3.0.2-11.debian.tar.xz
095b73992013d35e4263de1a4fea6671f7237f1b 21968 abiword_3.0.2-11_amd64.buildinfo
Checksums-Sha256:
1d2da76bc0d9c05dbba14c73a176649ef59512401ee8b79deb74636488068bb9 2915 abiword_3.0.2-11.dsc
04e625b5f10af0860dfeef593a2f8060d875807f9dda6211050eb6584158f68e 67440 abiword_3.0.2-11.debian.tar.xz
63f2976b69158085f951df00804efca39ab3998b517b608f083b6e1827676cf3 21968 abiword_3.0.2-11_amd64.buildinfo
Files:
968740be73412dac5b005a3519872698 2915 gnome optional abiword_3.0.2-11.dsc
7f7ae7a68bc2f45aecf700e78566c8e7 67440 gnome optional abiword_3.0.2-11.debian.tar.xz
bddf9b153149cb36425f2499dbd970c2 21968 gnome optional abiword_3.0.2-11_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAl7awMkACgkQLHwxRsGg
ASEkyQ//YBo0X+5W07jAFuElwtpcwmxRY+V/atxcLHXVaNV80tm6HGs9nr0AviBP
tWZSXq8a4bajadnFJ8R1le7YngAwYtfXXYvfT6Fv/dHM6tVn6wUhHfP/yCM2O93P
GSjduLxvuTA5Qf8pvhjvo/Ej6d1uTTkxTS/3MKL4vZvovssUmT4yRP+EY6nAHjYo
XZczN5djZ/Gt0rN7FOnAePhMVsY+sxfUGN65/Qzj5vE9/qSze6JmKVfxc/RveJBz
QwN+ycqY0bO7g22gZry8TQXKe1TM0YG68qRTXS5RCbQL5CJXV7kTa2wYmUp5jt9h
TWR9mY5EiKiyA33pMDTe0f0SmayMCrmrHK2iSalxPTQ2TilVb7FBHSfLYsYAcAJM
aLGsUicKUo01uwnuXXFj1zID4bG2FSJPvh6bcyfRy60zaGbd94VGfUMUD77ZmXS2
08V2BiaZieMiEuyiP6o9UrCMvVoopP1gdEjKOKgBaR4kYPI8gpu0umf4RCV9A/pP
+Jpbnw680HPGiJ0jJM/FVy2ruqxts3zhKCVrdGJAhgKAxzaTXfMKzO4zQi9dCgiA
HhY5eh4q9FCwL4p94DDRqUsYNzIFRjLWdbPCzHNqzNZuGCJ/Qd3WC2KnMZbSxx0J
543vKEfZdJGzFANN6BskR/Z9uwTDqOQB5QfCNZXsINDTtvjrOjo=
=lsdz
-----END PGP SIGNATURE-----
--- End Message ---