download.lst | 4 ++-- external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 +- external/libgpg-error/undeclared-environ-macOS.patch | 7 ++++--- external/libgpg-error/w32-build-fixes-6.patch | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-)
New commits: commit 802328a6055106d4bf1ecaba6db1b6cc473b96fd Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 20 12:24:48 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Oct 20 19:49:59 2025 +0200 libgpg-error: upgrade to 1.56 Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.56.tar.bz2 Change-Id: I6aeb7723e94cffe6bdcad8cd6af74891210c4d26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192709 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index e126ee3f1a37..0c1b36ef02d6 100644 --- a/download.lst +++ b/download.lst @@ -430,8 +430,8 @@ LIBFFI_TARBALL := libffi-3.5.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBGPGERROR_SHA256SUM := 95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78 -LIBGPGERROR_TARBALL := libgpg-error-1.55.tar.bz2 +LIBGPGERROR_SHA256SUM := 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 +LIBGPGERROR_TARBALL := libgpg-error-1.56.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 565f1d61db2f..64ab28477b63 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.39.3)) +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.40.0)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/undeclared-environ-macOS.patch b/external/libgpg-error/undeclared-environ-macOS.patch index e22c89027d89..51cf054cb8d5 100644 --- a/external/libgpg-error/undeclared-environ-macOS.patch +++ b/external/libgpg-error/undeclared-environ-macOS.patch @@ -1,11 +1,12 @@ +++ 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 @@ - +@@ -58,6 +58,9 @@ + #define _GPGRT_NEED_AFLOCAL 1 #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. */ + struct gpgrt_spawn_actions { diff --git a/external/libgpg-error/w32-build-fixes-6.patch b/external/libgpg-error/w32-build-fixes-6.patch index ff96aa1e35e8..673aa8c3f3fe 100644 --- a/external/libgpg-error/w32-build-fixes-6.patch +++ b/external/libgpg-error/w32-build-fixes-6.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -894,9 +894,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). */ @@ -12,4 +12,4 @@ + // (int)GetLastError ()); } - /* Process has been created suspended; resume it now. */ + if (process->detached)
