From 1f98da5972a592cefcc3ae076f577227ab96f626 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 2 Jun 2022 22:51:22 +0200
Subject: [PATCH] - libgpg-error: bump version to 1.45

---
 package/libgpg-error/libgpg-error.mk          |  2 +-
 ...tion-of-lock-obj-pub.native.h-for-cr.patch | 34 ----------------
 .../0002-build-Fix-disable-threads.patch      | 39 -------------------
 3 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 package/libgpg-error/patches/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch
 delete mode 100644 package/libgpg-error/patches/0002-build-Fix-disable-threads.patch

diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 3eb9177f..c5cfc8eb 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.42
+LIBGPG_ERROR_VERSION = 1.45
 LIBGPG_ERROR_DIR = libgpg-error-$(LIBGPG_ERROR_VERSION)
 LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
diff --git a/package/libgpg-error/patches/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch b/package/libgpg-error/patches/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch
deleted file mode 100644
index 621f070e..00000000
--- a/package/libgpg-error/patches/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7350874f6f62314af4c8ec1973c91d305a6f4ddc 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>
-Upstream: 33593864cd54143db594c4237bba41e14179061c
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.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.31.1
-
diff --git a/package/libgpg-error/patches/0002-build-Fix-disable-threads.patch b/package/libgpg-error/patches/0002-build-Fix-disable-threads.patch
deleted file mode 100644
index 6ed0f830..00000000
--- a/package/libgpg-error/patches/0002-build-Fix-disable-threads.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7ede0d4ce19e0ed14cd1cec81ba7df4e467f1eeb Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 21 Jun 2021 12:16:20 +0900
-Subject: [PATCH] build: Fix --disable-threads.
-
-* src/gen-lock-obj.sh: Fix generating '}}}'.
-
---
-
-GnuPG-bug-id: 5495
-Reported-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Fixes-commit: 1fb90a7da186ee2ee098a666f6f3a35bb1720e59
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-[Retrieved from:
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@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 258eec6..014667f 100755
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -121,10 +121,10 @@ while test "$i" -lt $ac_mtx_size; do
-     fi
-     i=$(( i + 1 ))
- done
-+echo '}}}'
- fi
- 
- cat <<'EOF'
--}}}
- ##
- ## Local Variables:
- ## mode: c
--- 
-2.31.1
-