[Commits] [SCM] claws-win32-installer branch, master, updated. 4.2.0-1-16-g5d39002

[jonathan at claws-mail.org]

The branch, master has been updated
       via  5d39002ffff805a121310e1b5fbffd067e31e33e (commit)
      from  593aea014e2621b50b9191e478195e8ef348bc47 (commit)

Summary of changes:
 packages/packages.current                 |  2 +-
 patches/libpsl-0.21.2/01-localtime_r.diff | 15 ---------------
 patches/libpsl-0.21.2/02-localtime_r.diff | 26 --------------------------
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 patches/libpsl-0.21.2/01-localtime_r.diff
 delete mode 100644 patches/libpsl-0.21.2/02-localtime_r.diff


- Log -----------------------------------------------------------------
commit 5d39002ffff805a121310e1b5fbffd067e31e33e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Mar 2 17:43:44 2024 -0700

    Update to libpsl-0.21.5

diff --git a/packages/packages.current b/packages/packages.current
index 995fdc2..4f6417d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -48,7 +48,7 @@ libgpg_error,1.48,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.
 libical,3.0.17,file,https://github.com/libical/libical/releases/download/v3.0.17/libical-3.0.17.tar.gz,bcda9a6db6870240328752854d1ea475af9bbc6356e6771018200e475e5f781b,,
 libiconv,1.17,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz,8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313,,
 libpng,1.6.43,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.43/libpng-1.6.43.tar.xz,6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c,,
-libpsl,0.21.2,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.2/libpsl-0.21.2.tar.gz,e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f,,
+libpsl,0.21.5,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.gz,1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208,,
 libsoup,2.74.3,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.3.tar.xz,e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13,,
 libtasn1,4.19.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.19.0.tar.gz,1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a,,
 libwebp,1.3.2,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.3.2.tar.gz,2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4,,
diff --git a/patches/libpsl-0.21.2/01-localtime_r.diff b/patches/libpsl-0.21.2/01-localtime_r.diff
deleted file mode 100644
index 89bcca6..0000000
--- a/patches/libpsl-0.21.2/01-localtime_r.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tools/psl.c b/tools/psl.c
-index 95d8b65..054d0b6 100644
---- a/tools/psl.c
-+++ b/tools/psl.c
-@@ -38,6 +38,10 @@
- 
- #ifdef _WIN32
- # include <winsock2.h> // WSAStartup, WSACleanup
-+
-+// Windows does not have localtime_r but has localtime_s, which is more or less
-+// the same except that the arguments are reversed
-+# define localtime_r(t_sec,t_now) localtime_s(t_now,t_sec)
- #endif
- 
- #include <stdlib.h>
diff --git a/patches/libpsl-0.21.2/02-localtime_r.diff b/patches/libpsl-0.21.2/02-localtime_r.diff
deleted file mode 100644
index 2c8fbdb..0000000
--- a/patches/libpsl-0.21.2/02-localtime_r.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tools/psl.c b/tools/psl.c
-index 054d0b6..ed94d5c 100644
---- a/tools/psl.c
-+++ b/tools/psl.c
-@@ -41,7 +41,11 @@
- 
- // Windows does not have localtime_r but has localtime_s, which is more or less
- // the same except that the arguments are reversed
--# define localtime_r(t_sec,t_now) localtime_s(t_now,t_sec)
-+# define LOCALTIME_R_SUCCESSFUL(t_sec,t_now)	\
-+	(localtime_s(t_now, t_sec) == 0)
-+#else
-+# define LOCALTIME_R_SUCCESSFUL(t_sec,t_now)	\
-+	(localtime_r(t_sec, t_now) != NULL)
- #endif
- 
- #include <stdlib.h>
-@@ -94,7 +98,7 @@ static const char *time2str(time_t t)
- 	static char buf[64];
- 	struct tm tm;
- 
--	if (localtime_r(&t, &tm) != NULL)
-+	if (LOCALTIME_R_SUCCESSFUL(&t, &tm))
- 		strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %Z", &tm);
- 	else
- 		strcpy(buf, "--notime--");

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port