summaryrefslogtreecommitdiff
path: root/mail/claws-mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail/claws-mail')
-rw-r--r--mail/claws-mail/MESSAGE9
-rw-r--r--mail/claws-mail/Makefile3
-rw-r--r--mail/claws-mail/Makefile.common4
-rw-r--r--mail/claws-mail/Makefile.vers4
-rw-r--r--mail/claws-mail/PLIST13
-rw-r--r--mail/claws-mail/distinfo18
-rw-r--r--mail/claws-mail/patches/patch-ah22
-rw-r--r--mail/claws-mail/patches/patch-ai16
-rw-r--r--mail/claws-mail/patches/patch-ca7
-rw-r--r--mail/claws-mail/patches/patch-src_common_unmime.c13
-rw-r--r--mail/claws-mail/patches/patch-src_plugins_pgpcore_sgpgme.c12
11 files changed, 59 insertions, 62 deletions
diff --git a/mail/claws-mail/MESSAGE b/mail/claws-mail/MESSAGE
index 399bbdfd5b6..4f03c4c601f 100644
--- a/mail/claws-mail/MESSAGE
+++ b/mail/claws-mail/MESSAGE
@@ -1,14 +1,7 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2008/10/15 16:22:02 smb Exp $
+$NetBSD: MESSAGE,v 1.3 2019/11/26 19:13:25 nia Exp $
All Claws-Mail plug-ins are separate packages, and must be installed
separately.
-When upgrading to 3.6.1 from earlier versions, be aware of two things.
-First, all user-specified keyboard shortcuts will have to be recreated.
-Second, the default spell-checker has changed from aspell to enchant, and
-the default installation of enchant from pkgsrc does not include aspell.
-You'll need to either install per-language dictionaries for the supported
-spell-checkers or rebuild enchant with aspell enabled.
-
===========================================================================
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index e8ed06022dd..e142249b6fc 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2019/08/22 12:23:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2019/11/26 19:13:25 nia Exp $
INSTALLATION_DIRS+= ${EGDIR}
INSTALLATION_DIRS+= share/claws-mail
-PKGREVISION= 9
.include "Makefile.common"
PKGNAME= claws-mail-${CLAWS_VERSION}
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 3872a0ec2e1..5794e185e31 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2019/11/02 16:25:18 rillig Exp $
+# $NetBSD: Makefile.common,v 1.21 2019/11/26 19:13:25 nia Exp $
# used by mail/claws-mail/plugins.mk
@@ -6,7 +6,7 @@
DISTNAME= claws-mail-${CLAWS_VERSION}
CATEGORIES= mail news x11
-MASTER_SITES= http://claws-mail.org/releases/
+MASTER_SITES= https://claws-mail.org/releases/
EXTRACT_SUFX= .tar.xz
HOMEPAGE= https://claws-mail.org/
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index b1ce09fbfff..3f513543ac4 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.23 2018/11/08 07:29:35 markd Exp $
+# $NetBSD: Makefile.vers,v 1.24 2019/11/26 19:13:25 nia Exp $
#
-CLAWS_VERSION= 3.17.1
+CLAWS_VERSION= 3.17.4
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index fc30f78f45c..2ee9f2b5be7 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.25 2018/11/08 07:29:35 markd Exp $
+@comment $NetBSD: PLIST,v 1.26 2019/11/26 19:13:25 nia Exp $
bin/claws-mail
-bin/sylpheed-claws
+bin/claws-mail-shred
include/claws-mail/account.h
include/claws-mail/action.h
include/claws-mail/adbookbase.h
@@ -29,9 +29,10 @@ include/claws-mail/autofaces.h
include/claws-mail/avatars.h
include/claws-mail/browseldap.h
include/claws-mail/claws-features.h
-include/claws-mail/codeconv.h
include/claws-mail/common/claws.h
+include/claws-mail/common/codeconv.h
include/claws-mail/common/defs.h
+include/claws-mail/common/file-utils.h
include/claws-mail/common/hooks.h
include/claws-mail/common/log.h
include/claws-mail/common/md5.h
@@ -54,6 +55,7 @@ include/claws-mail/common/tags.h
include/claws-mail/common/template.h
include/claws-mail/common/timing.h
include/claws-mail/common/tlds.h
+include/claws-mail/common/unmime.h
include/claws-mail/common/utils.h
include/claws-mail/common/uuencode.h
include/claws-mail/common/version.h
@@ -72,8 +74,8 @@ include/claws-mail/editldap.h
include/claws-mail/editldap_basedn.h
include/claws-mail/edittags.h
include/claws-mail/editvcard.h
-include/claws-mail/entity.h
include/claws-mail/enriched.h
+include/claws-mail/entity.h
include/claws-mail/etpan/etpan-errors.h
include/claws-mail/etpan/etpan-ssl.h
include/claws-mail/etpan/etpan-thread-manager-types.h
@@ -102,7 +104,6 @@ include/claws-mail/gtk/combobox.h
include/claws-mail/gtk/description_window.h
include/claws-mail/gtk/filesel.h
include/claws-mail/gtk/foldersort.h
-include/claws-mail/gtk/gdkkeysyms-new.h
include/claws-mail/gtk/gtkaspell.h
include/claws-mail/gtk/gtkcmclist.h
include/claws-mail/gtk/gtkcmctree.h
@@ -222,7 +223,6 @@ include/claws-mail/summaryview.h
include/claws-mail/textview.h
include/claws-mail/toolbar.h
include/claws-mail/undo.h
-include/claws-mail/unmime.h
include/claws-mail/uri_opener.h
include/claws-mail/vcard.h
include/claws-mail/viewtypes.h
@@ -254,6 +254,7 @@ share/locale/nb/LC_MESSAGES/claws-mail.mo
share/locale/nl/LC_MESSAGES/claws-mail.mo
share/locale/pl/LC_MESSAGES/claws-mail.mo
share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
+share/locale/pt_PT/LC_MESSAGES/claws-mail.mo
share/locale/ro/LC_MESSAGES/claws-mail.mo
share/locale/ru/LC_MESSAGES/claws-mail.mo
share/locale/sk/LC_MESSAGES/claws-mail.mo
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 2ed6d970d6f..5b3de70a460 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.32 2018/11/08 07:29:35 markd Exp $
+$NetBSD: distinfo,v 1.33 2019/11/26 19:13:25 nia Exp $
-SHA1 (claws-mail-3.17.1.tar.xz) = 7c6f34259e5f5e9b577feab1fa563b665d551399
-RMD160 (claws-mail-3.17.1.tar.xz) = f6b9e526ba9ed67768db6f422690a9e496b15854
-SHA512 (claws-mail-3.17.1.tar.xz) = de20e6ffbeba771249a42b03fecdb3c29c4db3ae9a95cb504156431495550a7d61233e61d26239d8f71022bf789c0abba0c29255a9c954ae8eb8cdc4ebfef67b
-Size (claws-mail-3.17.1.tar.xz) = 4746940 bytes
+SHA1 (claws-mail-3.17.4.tar.xz) = f91f1e687175a97960b576f9357e07ff38f91e2d
+RMD160 (claws-mail-3.17.4.tar.xz) = 420a0b1f6ff3efac9218478e0a1c60677eac0927
+SHA512 (claws-mail-3.17.4.tar.xz) = 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
+Size (claws-mail-3.17.4.tar.xz) = 6280252 bytes
SHA1 (patch-ab) = d1c89842cedad037c9ac3836da630244fe8ff9c9
SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
-SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
-SHA1 (patch-ai) = e2da8ef08afc0543cbbd00b71720d0002f8b9faf
-SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
-SHA1 (patch-ca) = eea9ff85a304f0f66bf6c6cc9b1161f0c36d04f6
+SHA1 (patch-ai) = f70a8b1e4f169740f90707b4c9b05851196c9323
+SHA1 (patch-ca) = 03d632bb8856acc6d3b7067d58942f69c91e141e
+SHA1 (patch-src_common_unmime.c) = b572895a8a3be4d6d78b34f6466cc2e80fa9d96f
+SHA1 (patch-src_plugins_pgpcore_sgpgme.c) = 1e972ddb501655ae347c35e623ccb4694776cf3e
diff --git a/mail/claws-mail/patches/patch-ah b/mail/claws-mail/patches/patch-ah
deleted file mode 100644
index b5e2064a263..00000000000
--- a/mail/claws-mail/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2013/07/24 15:26:11 drochner Exp $
-
---- src/plugins/pgpcore/sgpgme.c.orig 2013-05-08 08:46:17.000000000 +0000
-+++ src/plugins/pgpcore/sgpgme.c
-@@ -271,6 +271,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ct
- gpgme_key_t key;
- gpgme_error_t err;
- const gchar *keytype, *keyid, *uid;
-+ time_t ts;
-
- err = gpgme_get_key(ctx, sig->fpr, &key, 0);
-
-@@ -294,7 +295,8 @@ gchar *sgpgme_sigstat_info_full(gpgme_ct
- }
-
- memset(buf, 0, sizeof(buf));
-- fast_strftime(buf, sizeof(buf)-1, prefs_common_get_prefs()->date_format, localtime_r(&sig->timestamp, &lt));
-+ ts = sig->timestamp;
-+ fast_strftime(buf, sizeof(buf)-1, prefs_common_get_prefs()->date_format, localtime_r(&ts, &lt));
- g_string_append_printf(siginfo,
- _("Signature made on %s using %s key ID %s\n"),
- buf, keytype, keyid);
diff --git a/mail/claws-mail/patches/patch-ai b/mail/claws-mail/patches/patch-ai
index c9b6bac6ad1..eadac9688d9 100644
--- a/mail/claws-mail/patches/patch-ai
+++ b/mail/claws-mail/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.2 2015/04/03 12:34:44 nros Exp $
+$NetBSD: patch-ai,v 1.3 2019/11/26 19:13:25 nia Exp $
---- src/Makefile.in.orig 2014-10-27 18:59:09.000000000 +0000
+--- src/Makefile.in.orig 2019-07-26 11:01:25.000000000 +0000
+++ src/Makefile.in
-@@ -614,7 +614,7 @@ top_srcdir = @top_srcdir@
+@@ -734,7 +734,7 @@ unity_LIBS = @unity_LIBS@
@CLAWS_LIBETPAN_TRUE@etpan_dir = etpan
@CLAWS_LIBETPAN_FALSE@etpan_library =
@CLAWS_LIBETPAN_TRUE@etpan_library = etpan/libclawsetpan.la
--SUBDIRS = common gtk $(etpan_dir) . plugins
-+SUBDIRS = common gtk $(etpan_dir) .
- @PLATFORM_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- @PLATFORM_WIN32_TRUE@ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
- @PLATFORM_WIN32_TRUE@ sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+-SUBDIRS = common gtk $(etpan_dir) . plugins $(am__append_1)
++SUBDIRS = common gtk $(etpan_dir) . $(am__append_1)
+ @BUILD_TESTS_TRUE@GTESTER = gtester
+ @BUILD_TESTS_TRUE@GTESTER_REPORT = gtester-report
+
diff --git a/mail/claws-mail/patches/patch-ca b/mail/claws-mail/patches/patch-ca
index 74890410fe4..0d16ed52ab5 100644
--- a/mail/claws-mail/patches/patch-ca
+++ b/mail/claws-mail/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.4 2016/01/31 13:37:08 nros Exp $
+$NetBSD: patch-ca,v 1.5 2019/11/26 19:13:25 nia Exp $
---- src/plugins/vcalendar/vcal_folder.c.orig 2014-01-14 12:32:26.000000000 +0000
+--- src/plugins/vcalendar/vcal_folder.c.orig 2019-01-27 15:57:37.000000000 +0000
+++ src/plugins/vcalendar/vcal_folder.c
-@@ -766,7 +766,7 @@ GSList *vcal_get_events_list(FolderItem
+@@ -778,7 +778,7 @@ GSList *vcal_get_events_list(FolderItem
struct icaltimetype dtstart;
struct icaltimetype next;
icalrecur_iterator* ritr;
@@ -10,3 +10,4 @@ $NetBSD: patch-ca,v 1.4 2016/01/31 13:37:08 nros Exp $
+ time_t duration = (time_t) 0;
struct icaldurationtype ical_dur;
int i = 0;
+
diff --git a/mail/claws-mail/patches/patch-src_common_unmime.c b/mail/claws-mail/patches/patch-src_common_unmime.c
new file mode 100644
index 00000000000..e2dd5d45404
--- /dev/null
+++ b/mail/claws-mail/patches/patch-src_common_unmime.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_unmime.c,v 1.1 2019/11/26 19:13:25 nia Exp $
+
+--- src/common/unmime.c.orig 2018-11-17 13:11:44.000000000 +0000
++++ src/common/unmime.c
+@@ -143,7 +143,7 @@ gchar *unmime_header(const gchar *encode
+ }
+
+ /* convert to UTF-8 */
+- conv_str = conv_codeset_strdup(decoded_text, charset, NULL);
++ conv_str = conv_codeset_strdup(decoded_text, charset, "utf-8");
+ if (!conv_str || !g_utf8_validate(conv_str, -1, NULL)) {
+ g_free(conv_str);
+ conv_str = g_malloc(len + 1);
diff --git a/mail/claws-mail/patches/patch-src_plugins_pgpcore_sgpgme.c b/mail/claws-mail/patches/patch-src_plugins_pgpcore_sgpgme.c
new file mode 100644
index 00000000000..acb366b5ec4
--- /dev/null
+++ b/mail/claws-mail/patches/patch-src_plugins_pgpcore_sgpgme.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_plugins_pgpcore_sgpgme.c,v 1.1 2019/11/26 19:13:25 nia Exp $
+
+--- src/plugins/pgpcore/sgpgme.c.orig 2019-04-25 07:33:35.000000000 +0000
++++ src/plugins/pgpcore/sgpgme.c
+@@ -339,6 +339,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ct
+ gpgme_key_t key;
+ gpgme_error_t err;
+ const gchar *keytype, *keyid, *uid;
++ time_t ts;
+
+ err = gpgme_get_key(ctx, sig->fpr, &key, 0);
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 22:19:44 +0000