From 192d69a9b47b610a4875f7139d22bfd4de9ebc81 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 15 Nov 2021 19:00:49 +0100 Subject: Bump libgpg-error to v1.43 Signed-off-by: Thomas Deutschmann --- .../1.42/libgpg-error-1.36-gpg-error-config.patch | 38 ---------------------- .../libgpg-error-1.37-remove_broken_check.patch | 22 ------------- .../1.42/libgpg-error-1.42-cross_compile.patch | 32 ------------------ .../1.43/libgpg-error-1.36-gpg-error-config.patch | 38 ++++++++++++++++++++++ .../libgpg-error-1.37-remove_broken_check.patch | 22 +++++++++++++ 5 files changed, 60 insertions(+), 92 deletions(-) delete mode 100644 patches/libgpg-error/1.42/libgpg-error-1.36-gpg-error-config.patch delete mode 100644 patches/libgpg-error/1.42/libgpg-error-1.37-remove_broken_check.patch delete mode 100644 patches/libgpg-error/1.42/libgpg-error-1.42-cross_compile.patch create mode 100644 patches/libgpg-error/1.43/libgpg-error-1.36-gpg-error-config.patch create mode 100644 patches/libgpg-error/1.43/libgpg-error-1.37-remove_broken_check.patch diff --git a/patches/libgpg-error/1.42/libgpg-error-1.36-gpg-error-config.patch b/patches/libgpg-error/1.42/libgpg-error-1.36-gpg-error-config.patch deleted file mode 100644 index e94d57e6..00000000 --- a/patches/libgpg-error/1.42/libgpg-error-1.36-gpg-error-config.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e46b240..4606c31 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -531,16 +531,6 @@ fi - GPG_ERROR_CONFIG_HOST="$host" - - case "$includedir" in -- /usr/include|/include) ;; -- '${prefix}/include') -- if test "$prefix" != / -a "$prefix" != /usr; then -- if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then -- GPG_ERROR_CONFIG_CFLAGS="-I$includedir" -- else -- GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS" -- fi -- fi -- ;; - *) - if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then - GPG_ERROR_CONFIG_CFLAGS="-I$includedir" -@@ -550,16 +540,6 @@ case "$includedir" in - ;; - esac - case "$libdir" in -- /usr/lib|/usr/lib64|/lib|/lib64) ;; -- '${exec_prefix}/lib') -- if test "$exec_prefix" = "NONE"; then -- if test "$prefix" != / -a "$prefix" != /usr; then -- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" -- fi -- elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then -- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" -- fi -- ;; - *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; - esac - diff --git a/patches/libgpg-error/1.42/libgpg-error-1.37-remove_broken_check.patch b/patches/libgpg-error/1.42/libgpg-error-1.37-remove_broken_check.patch deleted file mode 100644 index 2919a9d7..00000000 --- a/patches/libgpg-error/1.42/libgpg-error-1.37-remove_broken_check.patch +++ /dev/null @@ -1,22 +0,0 @@ -This breaks our multilib builds: - - Confirm gpg-error-config works... no - *** Please report to with gpg-error-config-test.log - ---- libgpg-error-1.37/src/Makefile.am -+++ libgpg-error-1.37/src/Makefile.am -@@ -338,14 +338,6 @@ - cp gpg-error.h gpgrt.h - - gpg-error-config: gpgrt-config gpg-error-config-old -- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" -- @if ./gpg-error-config-test.sh --old-new; then \ -- echo "good"; \ -- else \ -- echo "no"; \ -- echo "*** Please report to with gpg-error-config-test.log"; \ -- exit 1; \ -- fi - cp gpg-error-config-old $@ - - install-data-local: diff --git a/patches/libgpg-error/1.42/libgpg-error-1.42-cross_compile.patch b/patches/libgpg-error/1.42/libgpg-error-1.42-cross_compile.patch deleted file mode 100644 index 78d98dd7..00000000 --- a/patches/libgpg-error/1.42/libgpg-error-1.42-cross_compile.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/patches/libgpg-error/1.43/libgpg-error-1.36-gpg-error-config.patch b/patches/libgpg-error/1.43/libgpg-error-1.36-gpg-error-config.patch new file mode 100644 index 00000000..e94d57e6 --- /dev/null +++ b/patches/libgpg-error/1.43/libgpg-error-1.36-gpg-error-config.patch @@ -0,0 +1,38 @@ +diff --git a/configure.ac b/configure.ac +index e46b240..4606c31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -531,16 +531,6 @@ fi + GPG_ERROR_CONFIG_HOST="$host" + + case "$includedir" in +- /usr/include|/include) ;; +- '${prefix}/include') +- if test "$prefix" != / -a "$prefix" != /usr; then +- if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then +- GPG_ERROR_CONFIG_CFLAGS="-I$includedir" +- else +- GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS" +- fi +- fi +- ;; + *) + if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then + GPG_ERROR_CONFIG_CFLAGS="-I$includedir" +@@ -550,16 +540,6 @@ case "$includedir" in + ;; + esac + case "$libdir" in +- /usr/lib|/usr/lib64|/lib|/lib64) ;; +- '${exec_prefix}/lib') +- if test "$exec_prefix" = "NONE"; then +- if test "$prefix" != / -a "$prefix" != /usr; then +- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" +- fi +- elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then +- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" +- fi +- ;; + *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; + esac + diff --git a/patches/libgpg-error/1.43/libgpg-error-1.37-remove_broken_check.patch b/patches/libgpg-error/1.43/libgpg-error-1.37-remove_broken_check.patch new file mode 100644 index 00000000..2919a9d7 --- /dev/null +++ b/patches/libgpg-error/1.43/libgpg-error-1.37-remove_broken_check.patch @@ -0,0 +1,22 @@ +This breaks our multilib builds: + + Confirm gpg-error-config works... no + *** Please report to with gpg-error-config-test.log + +--- libgpg-error-1.37/src/Makefile.am ++++ libgpg-error-1.37/src/Makefile.am +@@ -338,14 +338,6 @@ + cp gpg-error.h gpgrt.h + + gpg-error-config: gpgrt-config gpg-error-config-old +- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" +- @if ./gpg-error-config-test.sh --old-new; then \ +- echo "good"; \ +- else \ +- echo "no"; \ +- echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ +- fi + cp gpg-error-config-old $@ + + install-data-local: -- cgit v1.2.3-65-gdbad