download.lst | 4 ++--
external/gpgmepp/ExternalPackage_gpgmepp.mk | 4 ++--
external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 -
external/gpgmepp/gettid.patch | 14 --------------
4 files changed, 4 insertions(+), 19 deletions(-)
New commits:
commit 4ffd1e31b17965646fe4893e9a393fab3294b383
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Dec 4 20:02:54 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Dec 4 21:19:54 2024 +0100
gpgme: upgrade to 1.24.1
* external/gpgmepp/gettid.patch issue fixed upstream
Downloaded from https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.24.1.tar.bz2
Change-Id: Id2d984f5e68b8681bf5e635a1afe5d90605711ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177821
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index fab3ac84243f..a5d34d046ba8 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 :=
61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da
-GPGME_TARBALL := gpgme-1.24.0.tar.bz2
+GPGME_SHA256SUM :=
ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f
+GPGME_TARBALL := gpgme-1.24.1.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 098df90cefd8..731e3a6a87bc 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.21.0))
-$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.33.0))
+$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.21.1))
+$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.33.1))
else ifeq ($(OS),MACOSX)
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index 58126ba4a29d..30bef6435ee5 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
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
deleted file mode 100644
index 292cc4a4baa7..000000000000
--- a/external/gpgmepp/gettid.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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;
-
