From d600fdbedb920b185388810da43821cf7c61790c Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Sat, 28 Sep 2024 19:16:15 +0200
Subject: [PATCH] depends: libgpg-error: update to 1.50

---
 contrib/depends/packages/libgpg-error.mk      | 17 ++++++++++------
 .../libgpg-error/declare_environ_macos.patch  | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 contrib/depends/patches/libgpg-error/declare_environ_macos.patch

diff --git a/contrib/depends/packages/libgpg-error.mk b/contrib/depends/packages/libgpg-error.mk
index c668f80..d5cf9b2 100644
--- a/contrib/depends/packages/libgpg-error.mk
+++ b/contrib/depends/packages/libgpg-error.mk
@@ -1,25 +1,30 @@
 package=libgpg-error
-$(package)_version=1.49
+$(package)_version=1.50
 $(package)_download_path=https://www.gnupg.org/ftp/gcrypt/libgpg-error/
 $(package)_file_name=libgpg-error-$($(package)_version).tar.gz
-$(package)_sha256_hash=e59cc3ced0ae86f49073e2f2344676919a82fc5033716bee7232f6f778158792
+$(package)_sha256_hash=34a3b36ec8ad830f8f3ceb5db583d1f6dc8ae4c31d04f6da18ea18dd95396ab0
+$(package)_patches=declare_environ_macos.patch
 
 define $(package)_set_vars
-  $(package)_build_opts=CFLAGS="-fPIE"
+  $(package)_config_opts := --enable-static --disable-shared
+  $(package)_config_opts += --disable-doc --disable-tests
+  $(package)_config_opts += --enable-install-gpg-error-config
+  $(package)_build_opts := CFLAGS="-fPIE"
 endef
 
 define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/declare_environ_macos.patch && \
   cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux
 endef
 
 define $(package)_config_cmds
-    $($(package)_autoconf) --enable-static --disable-shared --enable-install-gpg-error-config
+  $($(package)_autoconf)
 endef
 
 define $(package)_build_cmds
-    $(MAKE) $($(package)_build_opts)
+  $(MAKE) $($(package)_build_opts)
 endef
 
 define $(package)_stage_cmds
-    $(MAKE) DESTDIR=$($(package)_staging_dir) install
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
diff --git a/contrib/depends/patches/libgpg-error/declare_environ_macos.patch b/contrib/depends/patches/libgpg-error/declare_environ_macos.patch
new file mode 100644
index 0000000..a2afe25
--- /dev/null
+++ b/contrib/depends/patches/libgpg-error/declare_environ_macos.patch
@@ -0,0 +1,20 @@
+Subject: [PATCH] core: Declare environ for macOS and others.
+---
+Index: src/spawn-posix.c
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/spawn-posix.c b/src/spawn-posix.c
+--- a/src/spawn-posix.c	(revision d18e28a948307fab016b1eed467a70653ca9576e)
++++ b/src/spawn-posix.c	(revision a59e902b887fd92337c9728f668cf9c89da3957a)
+@@ -57,6 +57,9 @@
+ 
+ #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.  */