diff options
Diffstat (limited to 'source/n/mutt')
-rwxr-xr-x | source/n/mutt/mutt.SlackBuild | 8 | ||||
-rw-r--r-- | source/n/mutt/mutt.gpgme.diff | 34 |
2 files changed, 1 insertions, 41 deletions
diff --git a/source/n/mutt/mutt.SlackBuild b/source/n/mutt/mutt.SlackBuild index 9484bc27a..e75749808 100755 --- a/source/n/mutt/mutt.SlackBuild +++ b/source/n/mutt/mutt.SlackBuild @@ -21,7 +21,7 @@ PKGNAM=mutt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -58,10 +58,6 @@ tar xvf $CWD/mutt-$VERSION.tar.?z* || exit 1 cd mutt-$VERSION || exit 1 chown -R root:root . -# "error creating gpgme context: Not operational?" bugfix -# http://dev.mutt.org/trac/ticket/3300 -zcat $CWD/mutt.gpgme.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -77,8 +73,6 @@ CFLAGS="$SLKCFLAGS" \ --enable-smtp \ --enable-gpgme \ --enable-hcache \ - --enable-locales-fix \ - --without-wc-funcs \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 diff --git a/source/n/mutt/mutt.gpgme.diff b/source/n/mutt/mutt.gpgme.diff deleted file mode 100644 index 8f8c40a4f..000000000 --- a/source/n/mutt/mutt.gpgme.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- mutt-1.5.20/init.c.orig 2009-07-21 17:54:59 +0200 -+++ mutt-1.5.20/init.c 2009-07-21 17:59:47 +0200 -@@ -37,7 +37,6 @@ - #endif - - -- - #include "mx.h" - #include "init.h" - #include "mailbox.h" -@@ -50,6 +49,10 @@ - #include <errno.h> - #include <sys/wait.h> - -+#if defined(CRYPT_BACKEND_GPGME) -+#include <gpgme.h> -+#endif -+ - #define CHECK_PAGER \ - if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && \ - (MuttVars[idx].flags & R_RESORT)) \ -@@ -3262,6 +3265,11 @@ - - mutt_read_histfile (); - -+#ifdef CRYPT_BACKEND_GPGME -+ /* needed since version 1.2.0, ticket #3300 */ -+ gpgme_check_version (NULL); -+#endif -+ - #if 0 - set_option (OPTWEED); /* turn weeding on by default */ - #endif - |