From 429ac8a534d4e1fffc0c7f5df47a4f4ac67fa2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 09:09:15 -0300
Subject: [PATCH] libgpg-error: update to 1.42.

Remove gen-lock-obj.sh workaround added in
e79f72db82769fef0830b0c34803a7685be1d268 (should have been removed at
the first update after that).

Use rm -r in post_install.
---
 srcpkgs/libgpg-error/patches/cross.patch    | 20 +++++++++++++
 srcpkgs/libgpg-error/patches/echo-fix.patch | 32 +++++++++++++++++++++
 srcpkgs/libgpg-error/template               | 17 ++++-------
 3 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/libgpg-error/patches/cross.patch
 create mode 100644 srcpkgs/libgpg-error/patches/echo-fix.patch

diff --git a/srcpkgs/libgpg-error/patches/cross.patch b/srcpkgs/libgpg-error/patches/cross.patch
new file mode 100644
index 0000000000..253fc50f66
--- /dev/null
+++ b/srcpkgs/libgpg-error/patches/cross.patch
@@ -0,0 +1,20 @@
+Upstream commit 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 added a
+--disable-threads config option and changed the case to only match linux-gnu*
+instead of linux*, because those are obviously very related changes.
+
+This patch reverts that part of the commit, and fixes cross building to musl
+archs for us.
+
+diff --git a/configure b/configure
+index 24b1cee..89a9937 100755
+--- a/configure
++++ b/configure
+@@ -17433,7 +17433,7 @@ if test x"$gl_use_threads" = xno; then
+ $as_echo "$as_me: generated src/lock-obj-pub.native.h for $host" >&6;}
+ elif test x$cross_compiling = xyes; then
+   case $host in
+-    *-*-linux-gnu*)
++    *-*-linux*)
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
diff --git a/srcpkgs/libgpg-error/patches/echo-fix.patch b/srcpkgs/libgpg-error/patches/echo-fix.patch
new file mode 100644
index 0000000000..78d98dd7b3
--- /dev/null
+++ b/srcpkgs/libgpg-error/patches/echo-fix.patch
@@ -0,0 +1,32 @@
+From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 26 Mar 2021 16:06:50 +0900
+Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
+ build.
+
+* src/gen-lock-obj.sh: Capture echo output with quotes.
+
+--
+
+Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
+Signed-off-by: David Michael <fedora.dm0@gmail.com>
+---
+ src/gen-lock-obj.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
+index a710f0c..258eec6 100755
+--- a/src/gen-lock-obj.sh
++++ b/src/gen-lock-obj.sh
+@@ -38,7 +38,7 @@
+ #     AWK=gawk ./gen-lock-obj.sh
+ #
+ 
+-if test -n `echo -n`; then
++if test -n "`echo -n`"; then
+     ECHO_C='\c'
+     ECHO_N=''
+ else
+-- 
+2.11.0
+
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index dbccf9aecf..309860f3f5 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,29 +1,22 @@
 # Template file for 'libgpg-error'
 pkgname=libgpg-error
-version=1.41
+version=1.42
 revision=1
 build_style=gnu-configure
 short_desc="Library for error values used by GnuPG component"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://www.gnupg.org"
-distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2
- https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;h=13858cfbf6c5f69f5f5fd64cd6fcc6a6c80eca3b>gen-lock-obj.sh"
-checksum="64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742
- 83892a9ebe3e19e8fd754a7ad02b6c81240e64554aab6490a4ea5aa36ea49a81"
-skip_extraction="gen-lock-obj.sh"
+distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
+patch_args=-Np1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qemu-user-static"
 fi
 
-pre_configure() {
-	cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/gen-lock-obj.sh ${wrksrc}/src
-	chmod +x ${wrksrc}/src/gen-lock-obj.sh
-}
-
 post_install() {
-	rm -rf ${DESTDIR}/usr/share/common-lisp
+	rm -r ${DESTDIR}/usr/share/common-lisp
 }
 
 libgpg-error-devel_package() {