download.lst | 4 ++--
external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 +-
external/libgpg-error/UnpackedTarball_libgpg-error.mk | 1 +
external/libgpg-error/undeclared-environ-macOS.patch | 11 +++++++++++
4 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 5a7283a0eb880c5273ea48b0d1a6f881c4297b1a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 19 14:17:35 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jun 21 12:24:16 2024 +0200
libgpg-error: upgrade to 1.50
Add external/libgpg-error/undeclared-environ-macOS.patch
from
https://github.com/gpg/libgpg-error/commit/a59e902b887fd92337c9728f668cf9c89da3957a
to fix
spawn-posix.c:345:5: error: use of undeclared identifier 'environ'
environ = act->environ;
^
1 error generated.
on macOS.
Downloaded from
https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.50.tar.bz2
Change-Id: Ica3a181626429da39651c29482326134ba25d556
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169200
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 20f11c74f2df..5ba08be05897 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBGPGERROR_SHA256SUM :=
8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
-LIBGPGERROR_TARBALL := libgpg-error-1.49.tar.bz2
+LIBGPGERROR_SHA256SUM :=
69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a
+LIBGPGERROR_TARBALL := libgpg-error-1.50.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 262675acf6e6..c7c49eefc3fd 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.36.0))
+$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.37.0))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 698c41997326..ae8f1c091d0c 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter
MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
$(if $(filter
LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
external/libgpg-error/clang-cl.patch \
+ external/libgpg-error/undeclared-environ-macOS.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/undeclared-environ-macOS.patch
b/external/libgpg-error/undeclared-environ-macOS.patch
new file mode 100644
index 000000000000..e22c89027d89
--- /dev/null
+++ b/external/libgpg-error/undeclared-environ-macOS.patch
@@ -0,0 +1,11 @@
++++ 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 @@
+
+ #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. */
