From 908b85de630fd0d474491c4f2f7402cb39553150 Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Mon, 11 Nov 2024 21:08:13 +0100
Subject: [PATCH] libgpg-error: upgrade to 1.51

* external/libgpg-error/w32-build-fixes-6.patch fixes
libgpg-error.lib(libgpg_error_la-spawn-w32.obj) : error LNK2019: unresolved external symbol __imp__AllowSetForegroundWindow@4 referenced in function __gpgrt_process_spawn

Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.51.tar.bz2

Change-Id: I6001d1932d1226c0daa037408523f98a9e719f2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176446
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 download.lst                                      |  4 ++--
 .../libgpg-error/ExternalPackage_libgpg-error.mk  |  2 +-
 .../libgpg-error/UnpackedTarball_libgpg-error.mk  |  3 ++-
 external/libgpg-error/w32-build-fixes-6.patch     | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 external/libgpg-error/w32-build-fixes-6.patch

diff --git a/download.lst b/download.lst
index bd9547fe1134..692dad358bb6 100644
--- a/download.lst
+++ b/download.lst
@@ -429,8 +429,8 @@ LIBFFI_TARBALL := libffi-3.4.6.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a
-LIBGPGERROR_TARBALL := libgpg-error-1.50.tar.bz2
+LIBGPGERROR_SHA256SUM := be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2
+LIBGPGERROR_TARBALL := libgpg-error-1.51.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index c7c49eefc3fd..532e8bba2f4e 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.37.0))
+$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.38.0))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index ae8f1c091d0c..6136fad535bc 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -17,8 +17,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
-	external/libgpg-error/w32-build-fixes-4.patch \
+	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-4.patch) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
+	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-6.patch) \
 	$(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
 	external/libgpg-error/clang-cl.patch \
 	external/libgpg-error/undeclared-environ-macOS.patch \
diff --git a/external/libgpg-error/w32-build-fixes-6.patch b/external/libgpg-error/w32-build-fixes-6.patch
new file mode 100644
index 000000000000..ff96aa1e35e8
--- /dev/null
+++ b/external/libgpg-error/w32-build-fixes-6.patch
@@ -0,0 +1,15 @@
+--- src/spawn-w32.c	2024-11-12 14:35:30.648259606 +0100
++++ src/spawn-w32.c	2024-11-12 14:35:56.972307401 +0100
+@@ -1061,9 +1061,9 @@
+       /* Fixme: For unknown reasons AllowSetForegroundWindow returns
+        * an invalid argument error if we pass it the correct
+        * processID.  As a workaround we use -1 (ASFW_ANY).  */
+-      if (!AllowSetForegroundWindow (ASFW_ANY /*pi.dwProcessId*/))
+-        _gpgrt_log_info ("AllowSetForegroundWindow() failed: ec=%d\n",
+-                         (int)GetLastError ());
++      //if (!AllowSetForegroundWindow (ASFW_ANY /*pi.dwProcessId*/))
++      //  _gpgrt_log_info ("AllowSetForegroundWindow() failed: ec=%d\n",
++      //                   (int)GetLastError ());
+     }
+ 
+   /* Process has been created suspended; resume it now. */