https://trac.macports.org/ticket/22009 (mutt-devel 1.5.20 Patch: fix gpgme 1.2.0 incompatibility)

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@62386 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Toby Peterson
2010-01-06 03:45:48 +00:00
parent e96d932f00
commit 157352e08a
2 changed files with 40 additions and 1 deletions
+7 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
name mutt-devel
version 1.5.20
revision 1
revision 2
categories mail
platforms darwin
maintainers simon openmaintainer
@@ -177,6 +177,12 @@ variant trash description {Add a Trash folder} {
variant gpgme description {Enable GPGME crypto support} {
configure.args-append --enable-gpgme --with-gpgme-prefix=${prefix}
depends_lib-append port:gpgme
# the following patch makes mutt 1.5.20 compatible with gpgme 1.2.0,
# cf. http://bugs.gentoo.org/show_bug.cgi?id=278394
# and http://dev.mutt.org/trac/ticket/3300
patchfiles-append patch-1.5.20.gpgme.diff
checksums-append patch-1.5.20.gpgme.diff md5 \
6faa84e2520dad7c603e8a8b9e0a9b30
}
livecheck.type regex
@@ -0,0 +1,33 @@
--- 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