From 8123eb99eaf1202583b438cb74579986f2b6303e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 28 Jul 2022 01:05:08 +0100 Subject: [PATCH] libgpg-error: update to 1.45. --- srcpkgs/libgpg-error/patches/cross.patch | 20 ------------- srcpkgs/libgpg-error/patches/echo-fix.patch | 32 --------------------- srcpkgs/libgpg-error/template | 4 +-- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/libgpg-error/patches/cross.patch delete 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 deleted file mode 100644 index 253fc50f661..00000000000 --- a/srcpkgs/libgpg-error/patches/cross.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 78d98dd7b3d..00000000000 --- a/srcpkgs/libgpg-error/patches/echo-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001 -From: David Michael -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 ---- - 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 98a7c475d1d..0bcf2a42e22 100644 --- a/srcpkgs/libgpg-error/template +++ b/srcpkgs/libgpg-error/template @@ -1,6 +1,6 @@ # Template file for 'libgpg-error' pkgname=libgpg-error -version=1.42 +version=1.45 revision=1 build_style=gnu-configure short_desc="Library for error values used by GnuPG component" @@ -8,7 +8,7 @@ maintainer="Orphaned " 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" -checksum=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 +checksum=570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 if [ "$CROSS_BUILD" ]; then hostmakedepends="qemu-user-static"