mutt: apply Debian patch for new GnuTLS

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

diff --git a/recipes/mutt/mutt-1.5.19/529838-gnutls-autoconf.patch b/recipes/mutt/mutt-1.5.19/529838-gnutls-autoconf.patch
new file mode 100644 (file)
index 0000000..75d23b6
--- /dev/null
+++ b/recipes/mutt/mutt-1.5.19/529838-gnutls-autoconf.patch
@@ -0,0 +1,20 @@
+More details about this patch are on http://bugs.debian.org/529838
+The bug and the patch were forwarded to upstream, please see 
+http://bugs.mutt.org/3239
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -690,10 +690,10 @@
+   then
+     AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support])
+   else
+-    MUTT_AM_PATH_GNUTLS([$gnutls_prefix],
++    PKG_CHECK_MODULES(GNUTLS, gnutls,
+       [dnl GNUTLS found
+-      CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
+-      MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
++      CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
++      MUTTLIBS="$MUTTLIBS $GNUTLS_LIBS"
+ 
+       AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
+       AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via GNUTLS. ])

diff --git a/recipes/mutt/mutt_1.5.19.bb b/recipes/mutt/mutt_1.5.19.bb
index 125e41b..1b17f7f 100644 (file)
--- a/recipes/mutt/mutt_1.5.19.bb
+++ b/recipes/mutt/mutt_1.5.19.bb
@@ -7,10 +7,11 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
            file://patch-1.5.19.sidebar.20090522.txt;patch=1 \
-           file://makedoc.patch;patch=1"
+          file://529838-gnutls-autoconf.patch;patch=1 \
+           file://makedoc.patch;patch=1" 
 
 S = "${WORKDIR}/mutt-1.5.19"