[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-70-g3853b5e

[jonathan at claws-mail.org]

The branch, master has been updated
       via  3853b5e50e4ad3fad85dc9ccc873b600dac8e7d7 (commit)
      from  d7c8b92c387ee4463d6161f4ccac142fcaf0d1a6 (commit)

Summary of changes:
 packages/packages.current                 |  2 +-
 patches/p11_kit-0.25.0/01-interface.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 patches/p11_kit-0.25.0/01-interface.patch


- Log -----------------------------------------------------------------
commit 3853b5e50e4ad3fad85dc9ccc873b600dac8e7d7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Oct 7 14:57:59 2023 -0700

    Update to p11-kit-0.25.0

diff --git a/packages/packages.current b/packages/packages.current
index ce25387..7427fc6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -43,7 +43,7 @@ libwebp,1.3.2,file,https://storage.googleapis.com/downloads.webmproject.org/rele
 libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
 libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
 nettle,3.9.1,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.9.1.tar.gz,ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3,,
-p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
+p11_kit,0.25.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.25.0/p11-kit-0.25.0.tar.xz,d55583bcdde83d86579cabe3a8f7f2638675fef01d23cace733ff748fc354706,,
 pango,1.50.14,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.14.tar.xz,1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8,,
 pcre2,10.42,file,https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2,8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840,,
 pixman,0.42.2,file,https://cairographics.org/releases/pixman-0.42.2.tar.gz,ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e,,
diff --git a/patches/p11_kit-0.25.0/01-interface.patch b/patches/p11_kit-0.25.0/01-interface.patch
new file mode 100644
index 0000000..b13717b
--- /dev/null
+++ b/patches/p11_kit-0.25.0/01-interface.patch
@@ -0,0 +1,30 @@
+From b6411d7a62c1d228042ccf663487253eea4cd84b Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at gnu.org>
+Date: Mon, 14 Aug 2023 21:26:01 +0900
+Subject: [PATCH] common: Avoid naming clash on MinGW
+
+The symbol "interface" is defined differently in a header included by
+default on MinGW, which prevents the use of it in a function signature
+in pkcs11.h.  To mitigate that, this renames it to "interface_".
+
+In the source there are more places where "interface" is used, though
+it shouldn't be a problem as WIN32_LEAN_AND_MEAN is set in compat.h.
+
+Signed-off-by: Daiki Ueno <ueno at gnu.org>
+---
+ common/pkcs11.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/pkcs11.h b/common/pkcs11.h
+index 053afdaf7..9510148a5 100644
+--- a/common/pkcs11.h
++++ b/common/pkcs11.h
+@@ -1442,7 +1442,7 @@ _CK_DECLARE_FUNCTION (C_GetInterfaceList,
+ _CK_DECLARE_FUNCTION (C_GetInterface,
+ 		      (unsigned char *interface_name,
+ 		       struct ck_version *version,
+-		       struct ck_interface **interface,
++		       struct ck_interface **interface_,
+ 		       ck_flags_t flags));
+ 
+ _CK_DECLARE_FUNCTION (C_LoginUser,

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


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