Bug#956699: ogmrip: Please witch to enchant-2 instead of enchant(1)
Source: ogmrip
Version: 1.0.1-2
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 (no tested though)
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 ogmrip-1.0.1/debian/control ogmrip-1.0.1/debian/control
--- ogmrip-1.0.1/debian/control 2019-10-11 00:27:43.000000000 +0200
+++ ogmrip-1.0.1/debian/control 2020-04-14 14:37:12.000000000 +0200
@@ -12,7 +12,7 @@
libdbus-glib-1-dev (>= 0.7.2),
libdvdread-dev (>= 4.1.3-4),
libenca-dev,
- libenchant-dev,
+ libenchant-2-dev,
libgconf2-dev,
libglade2-dev,
libnotify-dev (>= 0.7),
diff -Nru ogmrip-1.0.1/debian/patches/enchant2.patch ogmrip-1.0.1/debian/patches/enchant2.patch
--- ogmrip-1.0.1/debian/patches/enchant2.patch 1970-01-01 01:00:00.000000000 +0100
+++ ogmrip-1.0.1/debian/patches/enchant2.patch 2020-04-14 14:41:11.000000000 +0200
@@ -0,0 +1,30 @@
+--- a/configure.in
++++ b/configure.in
+@@ -161,7 +161,7 @@ AC_SUBST(DBUS_LIBS)
+ dnl **************************************************************
+
+ ENCHANT_REQUIRED=1.1.0
+-ENCHANT_MODULES="enchant >= $ENCHANT_REQUIRED"
++ENCHANT_MODULES="enchant-2 >= $ENCHANT_REQUIRED"
+
+ AC_ARG_ENABLE(enchant-support,
+ AC_HELP_STRING([--disable-enchant-support], [disable Enchant support]),
+--- a/src/ogmrip-spell-dialog.c
++++ b/src/ogmrip-spell-dialog.c
+@@ -315,14 +315,14 @@ ogmrip_spell_dialog_check_word (OGMRipSp
+ enchant_dict_add_to_session (dialog->priv->dict, word, len);
+ break;
+ case OGMRIP_SPELL_RESPONSE_ADD_WORD:
+- enchant_dict_add_to_personal (dialog->priv->dict, word, len);
++ enchant_dict_add (dialog->priv->dict, word, len);
+ break;
+ default:
+ break;
+ }
+
+ if (suggs && n_suggs)
+- enchant_dict_free_suggestions (dialog->priv->dict, suggs);
++ enchant_dict_free_string_list (dialog->priv->dict, suggs);
+ }
+
+ return status;
diff -Nru ogmrip-1.0.1/debian/patches/series ogmrip-1.0.1/debian/patches/series
--- ogmrip-1.0.1/debian/patches/series 2019-10-11 00:21:13.000000000 +0200
+++ ogmrip-1.0.1/debian/patches/series 2020-04-14 14:37:26.000000000 +0200
@@ -1,2 +1,3 @@
01_libdvdread4.diff
02_configure.diff
+enchant2.patch
Reply to: