diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-08 12:52:59 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-09 18:34:20 +0100 |
| commit | faae84f59f27cb13fc83a6ad87d360fabf20024f (patch) | |
| tree | 724bb0b25ed23dd3f3775978ca830ea67e315187 /recipes/mutt | |
| parent | 5b2b133db78610381418bece148b205ace687375 (diff) | |
mutt: apply Debian patch for new GnuTLS
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Diffstat (limited to 'recipes/mutt')
| -rw-r--r-- | recipes/mutt/mutt-1.5.19/529838-gnutls-autoconf.patch | 20 | ||||
| -rw-r--r-- | recipes/mutt/mutt_1.5.19.bb | 5 |
2 files changed, 23 insertions, 2 deletions
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 index 0000000000..75d23b62fa --- /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 125e41b256..1b17f7ffb3 100644 --- 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" |