From c9d3e68481e4db0e732b9186b75b582a5b41271b Mon Sep 17 00:00:00 2001
From: Taichi Haradaguchi <20001722@ymail.ne.jp>
Date: Sun, 25 Feb 2024 13:42:01 +0100
Subject: GPGME: upgrade to release 1.23.2

Change-Id: I56c419fbbe615ef57b7d8117ccdc32f0daddf95f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163840
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
---
 external/gpgmepp/ExternalPackage_gpgmepp.mk           |  4 ++--
 external/gpgmepp/Library_gpgmepp.mk                   |  1 +
 .../Wincompatible-function-pointer-types.patch        |  4 ++--
 external/gpgmepp/w32-build-fixes.patch.1              | 19 ++++++++++++++++---
 4 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'external/gpgmepp')

diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index ef49c398d215..be32afd6b324 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -15,8 +15,8 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.17.0))
-$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.29.0))
+$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.20.1))
+$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.32.1))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index ac71cf8b90ec..8191e55d4709 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,gpgmepp,\
 	UnpackedTarball/gpgmepp/lang/cpp/src/keylistresult \
 	UnpackedTarball/gpgmepp/lang/cpp/src/scdgetinfoassuantransaction \
 	UnpackedTarball/gpgmepp/lang/cpp/src/signingresult \
+	UnpackedTarball/gpgmepp/lang/cpp/src/statusconsumerassuantransaction \
 	UnpackedTarball/gpgmepp/lang/cpp/src/swdbresult \
 	UnpackedTarball/gpgmepp/lang/cpp/src/tofuinfo \
 	UnpackedTarball/gpgmepp/lang/cpp/src/trustitem \
diff --git a/external/gpgmepp/Wincompatible-function-pointer-types.patch b/external/gpgmepp/Wincompatible-function-pointer-types.patch
index 050d2e55cfc7..cd4f1117fd06 100755
--- a/external/gpgmepp/Wincompatible-function-pointer-types.patch
+++ b/external/gpgmepp/Wincompatible-function-pointer-types.patch
@@ -20,8 +20,8 @@
    (void)ctx;
 --- src/gpgme-w32spawn.c
 +++ src/gpgme-w32spawn.c
-@@ -243,7 +243,7 @@
-           handle = LoadLibrary ("user32.dll");
+@@ -24,7 +249,7 @@
+           handle = LoadLibraryA ("user32.dll");
            if (handle)
              {
 -              func = GetProcAddress (handle, "AllowSetForegroundWindow");
diff --git a/external/gpgmepp/w32-build-fixes.patch.1 b/external/gpgmepp/w32-build-fixes.patch.1
index 4d9428781cc5..250b2022c540 100644
--- a/external/gpgmepp/w32-build-fixes.patch.1
+++ b/external/gpgmepp/w32-build-fixes.patch.1
@@ -24,6 +24,19 @@ diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
  /* Constants used internally to select the data.  */
  enum
    {
+diff -ru gpgme.orig/src/gpgme-w32spawn.c gpgme/src/gpgme-w32spawn.c
+--- gpgme.orig/src/gpgme-w32spawn.c	2023-10-27 21:27:30.000000000 +0900
++++ gpgme/src/gpgme-w32spawn.c	2024-02-26 17:32:59.949338645 +0900
+@@ -52,6 +52,9 @@
+ #define mystderr stderr
+ #endif
+ 
++#ifdef _MSC_VER
++#define snwprintf _snwprintf
++#endif
+ 
+ 
+ static wchar_t *
 diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c
 --- gpgme.orig/src/mbox-util.c	2016-11-16 13:22:41.000000000 +0100
 +++ gpgme/src/mbox-util.c	2017-09-30 08:18:29.270567500 +0200
@@ -53,16 +66,16 @@ diff -ru gpgme.orig/src/priv-io.h gpgme/src/priv-io.h
 diff -ru gpgme.orig/src/util.h gpgme/src/util.h
 --- gpgme.orig/src/util.h	2017-03-28 11:41:30.000000000 +0200
 +++ gpgme/src/util.h	2017-09-30 08:10:54.194049100 +0200
-@@ -35,6 +35,9 @@
- #ifdef HAVE_UNISTD_H
+@@ -36,6 +36,9 @@
  # include <unistd.h>
  #endif
+ #include <stdint.h>
 +#ifdef _MSC_VER
 +typedef int pid_t;
 +#endif
  
- #include "gpgme.h"
  
+ #include "gpgme.h"
 diff -ru gpgme.orig/src/w32-util.c gpgme/src/w32-util.c
 --- gpgme.orig/src/w32-util.c	2017-03-09 09:01:10.000000000 +0100
 +++ gpgme/src/w32-util.c	2017-09-30 08:32:02.114330500 +0200
-- 
cgit