3 files changed, 13 insertions, 1 deletions
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.  */