diff options
| -rw-r--r-- | mail/claws-mail/Makefile | 3 | ||||
| -rw-r--r-- | mail/claws-mail/distinfo | 6 | ||||
| -rw-r--r-- | mail/claws-mail/files/patch-plugins-pgcore_sgpgme.c | 30 | ||||
| -rw-r--r-- | mail/claws-mail/files/patch-src_privacy.c | 19 | ||||
| -rw-r--r-- | mail/claws-mail/pkg-plist | 2 |
5 files changed, 56 insertions, 4 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index ecfd3b304c45..cdfa3e7f403c 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -6,7 +6,7 @@ # PORTNAME= claws-mail -PORTVERSION= 3.7.3 +PORTVERSION= 3.7.4 CATEGORIES= mail news ipv6 MASTER_SITES= SF/sylpheed-claws/Claws%20Mail/${PORTVERSION} @@ -34,6 +34,7 @@ USE_GNOME= gnomehack pkgconfig gtk20 glib20 atk libartlgpl2 pango libxml2 GNU_CONFIGURE= yes WANT_GNOME= yes INSTALLS_ICONS= yes +MAKE_JOBS_SAFE= yes MAN1= claws-mail.1 diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index 1c17bdd6e606..67e2e18e40c8 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,3 +1,3 @@ -MD5 (claws-mail-3.7.3.tar.bz2) = b3af5ea5e1182aa53f971657db86e110 -SHA256 (claws-mail-3.7.3.tar.bz2) = e201da90060bdb79581ed4d6fcc5273d54a5a2649eb9508e0c9e7e6d204ee369 -SIZE (claws-mail-3.7.3.tar.bz2) = 5941284 +MD5 (claws-mail-3.7.4.tar.bz2) = aa6c8b9177bc2bc506470821ee2afbb2 +SHA256 (claws-mail-3.7.4.tar.bz2) = 96022a5a2982d945320ce0ffc4e572dbd6b2e9856a0a7de2336c8211cc66089d +SIZE (claws-mail-3.7.4.tar.bz2) = 5971559 diff --git a/mail/claws-mail/files/patch-plugins-pgcore_sgpgme.c b/mail/claws-mail/files/patch-plugins-pgcore_sgpgme.c new file mode 100644 index 000000000000..85f988bc357f --- /dev/null +++ b/mail/claws-mail/files/patch-plugins-pgcore_sgpgme.c @@ -0,0 +1,30 @@ +Index: src/plugins/pgpcore/sgpgme.c +=================================================================== +RCS file: //claws/src/plugins/pgpcore/Attic/sgpgme.c,v +retrieving revision 1.1.2.65 +retrieving revision 1.1.2.66 +diff -u -r1.1.2.65 -r1.1.2.66 +--- src/plugins/pgpcore/sgpgme.c 20 Oct 2009 17:40:30 -0000 1.1.2.65 ++++ src/plugins/pgpcore/sgpgme.c 16 Jan 2010 18:19:42 -0000 1.1.2.66 +@@ -860,15 +860,17 @@ + if (!err) + err = gpgme_op_keylist_next(ctx, &key); + gpgme_op_keylist_end(ctx); +- gpgme_release(ctx); + if (gpg_err_code(err) == GPG_ERR_EOF) { + if (gpgme_get_protocol(ctx) != GPGME_PROTOCOL_CMS) { + gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS); + goto check_again; + } ++ gpgme_release(ctx); + return FALSE; +- } else ++ } else { ++ gpgme_release(ctx); + return TRUE; ++ } + } + + void sgpgme_check_create_key(void) + + diff --git a/mail/claws-mail/files/patch-src_privacy.c b/mail/claws-mail/files/patch-src_privacy.c new file mode 100644 index 000000000000..422f806ebe7b --- /dev/null +++ b/mail/claws-mail/files/patch-src_privacy.c @@ -0,0 +1,19 @@ +Index: src/privacy.c +=================================================================== +RCS file: //claws/src/privacy.c,v +retrieving revision 1.10.2.22 +retrieving revision 1.10.2.23 +diff -u -r1.10.2.22 -r1.10.2.23 +--- src/privacy.c 23 Feb 2009 16:55:45 -0000 1.10.2.22 ++++ src/privacy.c 15 Jan 2010 13:42:13 -0000 1.10.2.23 +@@ -318,6 +318,8 @@ + GSList *cur; + cm_return_val_if_fail(mimeinfo != NULL, FALSE); + ++ procmime_decode_content(mimeinfo); ++ + for(cur = systems; cur != NULL; cur = g_slist_next(cur)) { + PrivacySystem *system = (PrivacySystem *) cur->data; + + + diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist index 8066a29bfce6..aef1190c298b 100644 --- a/mail/claws-mail/pkg-plist +++ b/mail/claws-mail/pkg-plist @@ -295,7 +295,9 @@ share/applications/claws-mail.desktop %%DOCSDIR%%/manual/pl/claws-mail-manual.pdf %%DOCSDIR%%/manual/pl/claws-mail-manual.ps %%DOCSDIR%%/manual/pl/claws-mail-manual.txt +share/icons/hicolor/128x128/apps/claws-mail-128x128.png share/icons/hicolor/48x48/apps/claws-mail.png +share/icons/hicolor/64x64/apps/claws-mail-64x64.png share/locale/bg/LC_MESSAGES/claws-mail.mo share/locale/ca/LC_MESSAGES/claws-mail.mo share/locale/cs/LC_MESSAGES/claws-mail.mo |