strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpgme: upgrade to 1.24.1

Browse source 
* 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 <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2024-12-04 20:02:54 +01:00
parent 393565203e
commit 4ffd1e31b1
4 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -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

4
external/gpgmepp/ExternalPackage_gpgmepp.mk vendored
View file

@ -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)

1
external/gpgmepp/UnpackedTarball_gpgmepp.mk vendored
View file

@ -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 \

14
external/gpgmepp/gettid.patch vendored
View file

@ -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;