download.lst | 4 ++--
external/gpgmepp/ExternalPackage_gpgmepp.mk | 4 ++--
external/gpgmepp/UnpackedTarball_gpgmepp.mk | 2 ++
external/gpgmepp/gettid.patch | 14 ++++++++++++++
external/gpgmepp/strcasecmp.patch | 14 ++++++++++++++
external/gpgmepp/w32-fix-win32-macro.patch.1 | 11 -----------
external/gpgmepp/w32-include.patch | 20 --------------------
7 files changed, 34 insertions(+), 35 deletions(-)
New commits:
commit 96fb0457f49975a7e9a90eb92442e678b5d279ba
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Nov 6 20:56:11 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 8 22:49:42 2024 +0100
gpgme: Upgrade to 1.24.0
* external/gpgmepp/gettid.patch fixes
/opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld:
./.libs/libgpgme.so: undefined reference to `gettid'
* external/gpgmepp/strcasecmp.patch fixes
libgpgme.lib(key.obj) : error LNK2019: unresolved external symbol
_strcasecmp referenced in function __gpgme_key_append_name
Downloaded from https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.24.0.tar.bz2
Change-Id: I2f2587f5157db7610d6ffaa84b49f9677ba1cc4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176160
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index a00bc35b9669..bd9547fe1134 100644
--- a/download.lst
+++ b/download.lst
@@ -317,8 +317,8 @@ GLM_TARBALL := glm-1.0.1.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 :=
61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da
+GPGME_TARBALL := gpgme-1.24.0.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..098df90cefd8 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.0))
+$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.33.0))
else ifeq ($(OS),MACOSX)
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index dcbda38d591d..58126ba4a29d 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -24,9 +24,11 @@ $(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) \
+ $(if $(filter LINUX,$(OS)),external/gpgmepp/gettid.patch) \
external/gpgmepp/ubsan.patch \
external/gpgmepp/c++20.patch \
external/gpgmepp/clang-cl.patch \
diff --git a/external/gpgmepp/gettid.patch b/external/gpgmepp/gettid.patch
new file mode 100644
index 000000000000..292cc4a4baa7
--- /dev/null
+++ b/external/gpgmepp/gettid.patch
@@ -0,0 +1,14 @@
+--- src/debug.c 2024-11-08 13:08:06.174085089 +0100
++++ src/debug.c 2024-11-08 13:11:43.133601548 +0100
+@@ -152,8 +152,10 @@
+ #ifdef HAVE_W32_SYSTEM
+ thread = (uintptr_t)GetCurrentThreadId ();
+ #elif defined(__linux)
++#ifdef SYS_gettid
+ thread = (uintptr_t)gettid ();
+ #endif
++#endif
+ if (sizeof (thread) < len)
+ {
+ int zerolen = len;
+
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
