[Commits] [SCM] claws-win32-installer branch, master, updated. 4.3.0-1-28-g0db5d11

jonathan at claws-mail.org jonathan at claws-mail.org
Mon Sep 30 06:03:57 UTC 2024


The branch, master has been updated
       via  0db5d11d176ce45cf1584020295b31108b5c1c51 (commit)
      from  dabd2f7ebb1295f3cb2914309f91d374b282b8e5 (commit)

Summary of changes:
 patches/p11_kit-0.25.0/01-interface.patch | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 patches/p11_kit-0.25.0/01-interface.patch


- Log -----------------------------------------------------------------
commit 0db5d11d176ce45cf1584020295b31108b5c1c51
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Sep 29 18:30:14 2024 -0700

    Remove old p11-kit patch

diff --git a/patches/p11_kit-0.25.0/01-interface.patch b/patches/p11_kit-0.25.0/01-interface.patch
deleted file mode 100644
index b13717b..0000000
--- a/patches/p11_kit-0.25.0/01-interface.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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


More information about the Commits mailing list