diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/gpgmepp/ExternalPackage_gpgmepp.mk | 4 | ||||
| -rw-r--r-- | external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 | ||||
| -rw-r--r-- | external/gpgmepp/gettid.patch | 14 |
4 files changed, 4 insertions, 19 deletions
diff --git a/download.lst b/download.lst index b8c129662897..38cb06964f53 100644 --- a/download.lst +++ b/download.lst @@ -282,8 +282,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; - |