download.lst | 8 +++----
external/gpgmepp/ExternalPackage_gpgmepp.mk | 4 +--
external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1
external/gpgmepp/strcasecmp.patch | 14 ++++++++++++
external/gpgmepp/w32-fix-win32-macro.patch.1 | 11 ---------
external/gpgmepp/w32-include.patch | 20 ------------------
external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 -
external/libgpg-error/UnpackedTarball_libgpg-error.mk | 4 ++-
external/libgpg-error/undeclared-environ-macOS.patch | 11 +++++++++
external/libgpg-error/w32-build-fixes-5.patch | 9 +++++---
external/libgpg-error/w32-build-fixes-6.patch | 15 +++++++++++++
11 files changed, 57 insertions(+), 42 deletions(-)
New commits:
commit 22eb5d595a0750548a079f8a5001b5e1c9bd5ebf
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Nov 6 20:56:11 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 5 20:51:12 2025 +0200
gpgme: upgrade to 1.24.2
Downloaded from https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.24.2.tar.bz2
Change-Id: I3b75db7258a99cbab1f68151e678d118376b949c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181362
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184969
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/download.lst b/download.lst
index a733b2a5296a..febb3341c246 100644
--- a/download.lst
+++ b/download.lst
@@ -385,8 +385,8 @@ GLM_TARBALL := glm-0.9.9.8.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
-GPGME_SHA256SUM :=
9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
-GPGME_TARBALL := gpgme-1.23.2.tar.bz2
+GPGME_SHA256SUM :=
e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581
+GPGME_TARBALL := gpgme-1.24.2.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index be32afd6b324..448815c8a630 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.20.1))
-$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.32.1))
+$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.21.2))
+$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.33.2))
else ifeq ($(OS),MACOSX)
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index dcbda38d591d..30bef6435ee5 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-win32-macro.patch.1) \
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \
$(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \
+ $(if $(filter MSC,$(COM)),external/gpgmepp/strcasecmp.patch) \
external/gpgmepp/w32-build-fixes-2.patch \
$(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \
$(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \
diff --git a/external/gpgmepp/strcasecmp.patch
b/external/gpgmepp/strcasecmp.patch
new file mode 100644
index 000000000000..4dc382a07b03
--- /dev/null
+++ b/external/gpgmepp/strcasecmp.patch
@@ -0,0 +1,14 @@
+--- src/key.c 2024-11-08 20:45:01.826019597 +0100
++++ src/key.c 2024-11-08 20:46:15.369716357 +0100
+@@ -19,6 +19,10 @@
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
++#ifdef _MSC_VER
++# define strcasecmp _stricmp
++#endif
++
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+
diff --git a/external/gpgmepp/w32-fix-win32-macro.patch.1
b/external/gpgmepp/w32-fix-win32-macro.patch.1
index 8ab7b0fab089..7041385f7962 100644
--- a/external/gpgmepp/w32-fix-win32-macro.patch.1
+++ b/external/gpgmepp/w32-fix-win32-macro.patch.1
@@ -121,17 +121,6 @@ diff -ur gpgmepp.org/lang/cpp/src/key.cpp
gpgmepp/lang/cpp/src/key.cpp
const GpgME::Key::Null GpgME::Key::null;
namespace GpgME
-diff -ur gpgmepp.org/lang/cpp/src/key.h gpgmepp/lang/cpp/src/key.h
---- gpgmepp.org/lang/cpp/src/key.h 2017-03-20 20:10:15.000000000 +0100
-+++ gpgmepp/lang/cpp/src/key.h 2017-11-20 17:07:51.551632000 +0100
-@@ -30,7 +30,6 @@
- #include "gpgmefw.h"
-
- #include <memory>
--#include <sys/time.h>
-
- #include <vector>
- #include <algorithm>
diff -ur gpgmepp.org/lang/qt/src/qgpgme_export.h
gpgmepp/lang/qt/src/qgpgme_export.h
--- gpgmepp.org/lang/qt/src/qgpgme_export.h 2016-11-03 17:32:30.000000000
+0100
+++ gpgmepp/lang/qt/src/qgpgme_export.h 2017-11-20 16:58:27.395388000
+0100
diff --git a/external/gpgmepp/w32-include.patch
b/external/gpgmepp/w32-include.patch
index 0fda72c2b072..30fdba5f8f26 100644
--- a/external/gpgmepp/w32-include.patch
+++ b/external/gpgmepp/w32-include.patch
@@ -20,23 +20,3 @@
#include <process.h>
#include "priv-io.h"
---- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.h
-+++ lang/cpp/src/gpgaddexistingsubkeyeditinteractor.h
-@@ -27,6 +27,7 @@
- #include "editinteractor.h"
-
- #include <memory>
-+#include <string>
-
- namespace GpgME
- {
---- lang/cpp/src/gpgrevokekeyeditinteractor.h
-+++ lang/cpp/src/gpgrevokekeyeditinteractor.h
-@@ -28,6 +28,7 @@
- #include "global.h"
-
- #include <memory>
-+#include <string>
- #include <vector>
-
- namespace GpgME
commit ae74c335cdc78a383aa6c26b15cc13fe29499009
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Apr 26 09:50:09 2024 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 5 20:51:00 2025 +0200
libgpg-error: upgrade to 1.55
Downloaded from
https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.55.tar.bz2
Change-Id: Ia7592c071caedcfb4fb75b9516f44932000f2567
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184611
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184967
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/download.lst b/download.lst
index 2ee8639524c7..a733b2a5296a 100644
--- a/download.lst
+++ b/download.lst
@@ -497,8 +497,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBGPGERROR_SHA256SUM :=
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
-LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
+LIBGPGERROR_SHA256SUM :=
95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78
+LIBGPGERROR_TARBALL := libgpg-error-1.55.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 2c64ba3b5cc6..565f1d61db2f 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.35.0))
+$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.39.3))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 698c41997326..6136fad535bc 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -17,10 +17,12 @@ $(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 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/undeclared-environ-macOS.patch
b/external/libgpg-error/undeclared-environ-macOS.patch
new file mode 100644
index 000000000000..e22c89027d89
--- /dev/null
+++ b/external/libgpg-error/undeclared-environ-macOS.patch
@@ -0,0 +1,11 @@
++++ src/spawn-posix.c 2024-06-21 10:44:49.676834437 +0200
++++ src/spawn-posix.c 2024-06-21 10:45:09.008841639 +0200
+@@ -57,6 +57,8 @@
+
+ #include "gpgrt-int.h"
+
++/* (Only glibc's unistd.h declares this iff _GNU_SOURCE is used.) */
++extern char **environ;
+
+ /* Definition for the gpgrt_spawn_actions_t. Note that there is a
+ * different one for Windows. */
diff --git a/external/libgpg-error/w32-build-fixes-5.patch
b/external/libgpg-error/w32-build-fixes-5.patch
index 80d52f720e13..154cae3f8cd0 100644
--- a/external/libgpg-error/w32-build-fixes-5.patch
+++ b/external/libgpg-error/w32-build-fixes-5.patch
@@ -130,12 +130,15 @@
--- src/w32-add.h 2020-06-06 00:32:38.502203300 +0200
+++ src/w32-add.h~ 2018-12-07 14:48:19.000000000 +0100
-@@ -65,3 +65,5 @@
- char *gpgrt_w32_reg_query_string (const char *root,
+@@ -89,5 +89,7 @@
const char *dir,
const char *name);
-+
+
+wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen);
++
+ /* Query a string in the registry using a unified key representation. */
+ char *gpgrt_w32_reg_get_string (const char *key);
+
--- src/w32-gettext.c 2022-03-04 21:44:26.000000000 +0900
+++ src/w32-gettext.c~ 2023-08-30 16:01:12.861855006 +0900
@@ -1325,7 +1325,7 @@
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
",
+- (int)GetLastError ());
++ //if (!AllowSetForegroundWindow (ASFW_ANY /*pi.dwProcessId*/))
++ // _gpgrt_log_info ("AllowSetForegroundWindow() failed: ec=%d
",
++ // (int)GetLastError ());
+ }
+
+ /* Process has been created suspended; resume it now. */
