Control: tags 949720 + patch Control: tags 949720 + pending
Dear maintainer, I've prepared an NMU for sylpheed (versioned as 3.7.0-5.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards. diff -Nru sylpheed-3.7.0/debian/changelog sylpheed-3.7.0/debian/changelog --- sylpheed-3.7.0/debian/changelog 2019-08-31 16:51:17.000000000 +0200 +++ sylpheed-3.7.0/debian/changelog 2020-01-24 10:50:27.000000000 +0100 @@ -1,3 +1,11 @@ +sylpheed (3.7.0-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to enchant-2, bump libgtkspell-dev build-dependency to avoid + linking against both versions of libenchant (Closes: #949720) + + -- Laurent Bigonville <bi...@debian.org> Fri, 24 Jan 2020 10:50:27 +0100 + sylpheed (3.7.0-5) unstable; urgency=medium [ Hideki Yamane ] diff -Nru sylpheed-3.7.0/debian/control sylpheed-3.7.0/debian/control --- sylpheed-3.7.0/debian/control 2019-08-31 16:51:17.000000000 +0200 +++ sylpheed-3.7.0/debian/control 2020-01-24 10:26:39.000000000 +0100 @@ -8,8 +8,8 @@ libcompfaceg1-dev, libglib2.0-dev, libgtk2.0-dev, libpng-dev, libgpgme-dev (>= 1.0.0), libssl-dev, libldap2-dev, flex, bison, gettext, - libreadline6-dev, libgtkspell-dev (>= 2.0), libonig-dev, - libenchant-dev, + libreadline6-dev, libgtkspell-dev (>= 2.0.16-1.3~), libonig-dev, + libenchant-2-dev, Standards-Version: 4.4.0 Homepage: https://sylpheed.sraoss.jp/en/ Vcs-Git: https://salsa.debian.org/sylpheed-team/sylpheed.git diff -Nru sylpheed-3.7.0/debian/patches/enchant-2.patch sylpheed-3.7.0/debian/patches/enchant-2.patch --- sylpheed-3.7.0/debian/patches/enchant-2.patch 1970-01-01 01:00:00.000000000 +0100 +++ sylpheed-3.7.0/debian/patches/enchant-2.patch 2020-01-24 10:42:24.000000000 +0100 @@ -0,0 +1,31 @@ +Description: Switch to enchant-2 +Author: Laurent Bigonville <bi...@debian.org> +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949720 + +--- a/configure.ac ++++ b/configure.ac +@@ -319,10 +319,10 @@ if test "$ac_cv_enable_gtkspell" = yes; + LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`" + if $PKG_CONFIG --atleast-version 2.0.13 gtkspell-2.0 ; then + AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell) +- LIBS="$LIBS `$PKG_CONFIG --libs enchant`" ++ LIBS="$LIBS `$PKG_CONFIG --libs enchant-2`" + + dnl Workaroud for zemberek crash +- if $PKG_CONFIG --atleast-version 1.4.2 enchant ; then ++ if $PKG_CONFIG --atleast-version 1.4.2 enchant-2 ; then + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags dbus-glib-1`" + LIBS="$LIBS `$PKG_CONFIG --libs dbus-glib-1`" + fi +--- a/src/compose.c ++++ b/src/compose.c +@@ -71,7 +71,7 @@ + # include <gtk/gtkradiomenuitem.h> + # include <gtkspell/gtkspell.h> + #if USE_ENCHANT +-# include <enchant/enchant.h> ++# include <enchant-2/enchant.h> + #else + # include <aspell.h> + #endif diff -Nru sylpheed-3.7.0/debian/patches/series sylpheed-3.7.0/debian/patches/series --- sylpheed-3.7.0/debian/patches/series 2019-08-31 16:51:17.000000000 +0200 +++ sylpheed-3.7.0/debian/patches/series 2020-01-24 10:26:53.000000000 +0100 @@ -7,3 +7,4 @@ 0007-Specify-MACRO_DIRS-as-general.patch 0008-detect-oniguruma-without-onig-config.patch 0009-support-SNI-for-IMAP.patch +enchant-2.patch
