[62386] trunk/dports/mail/mutt-devel
toby at macports.org
toby at macports.org
Tue Jan 5 19:45:51 PST 2010
Revision: 62386
http://trac.macports.org/changeset/62386
Author: toby at macports.org
Date: 2010-01-05 19:45:48 -0800 (Tue, 05 Jan 2010)
Log Message:
-----------
#22009 (mutt-devel 1.5.20 Patch: fix gpgme 1.2.0 incompatibility)
Modified Paths:
--------------
trunk/dports/mail/mutt-devel/Portfile
Added Paths:
-----------
trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff
Modified: trunk/dports/mail/mutt-devel/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile 2010-01-06 00:54:23 UTC (rev 62385)
+++ trunk/dports/mail/mutt-devel/Portfile 2010-01-06 03:45:48 UTC (rev 62386)
@@ -4,7 +4,7 @@
name mutt-devel
version 1.5.20
-revision 1
+revision 2
categories mail
platforms darwin
maintainers simon openmaintainer
@@ -177,6 +177,12 @@
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
Added: trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff (rev 0)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff 2010-01-06 03:45:48 UTC (rev 62386)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100105/47c3aefc/attachment.html>
More information about the macports-changes
mailing list