From: Guðni Már Gilbert <gudni.m.g@gmail.com>
Date: Sat, 25 Jan 2025 15:32:42 +0000 (+0000)
Subject: gnupg: remove obsolete patch
X-Git-Tag: uninative-4.7~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c10b2ad17bacec024427693eb025659f455a20;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

gnupg: remove obsolete patch

Remove a patch which is already merged in v2.5.1

See for reference:
https://github.com/gpg/gnupg/commit/1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f
https://dev.gnupg.org/T7193

Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
deleted file mode 100644
index ec99f4b10c3..00000000000
--- a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 81c222ea179ef73fcae4b50c56342bdad4787a28 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 22 Aug 2024 15:31:16 +0800
-Subject: [PATCH] fix compile failure with musl
-
-```
-../../gnupg-2.5.0/scd/app.c:379:3: error: implicit declaration of function 'write'; did you mean 'fwrite'? [-Wimplicit-function-declaration]
-  379 |   write (card_list_lock.notify_pipe[1], "", 1);
-      |   ^~~~~
-      |   fwrite
-```
-To access the Posix low level file interface such as open, read,
-write and close, should include <unistd.h>.
-
-Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- scd/app.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scd/app.c b/scd/app.c
-index ba7bb23..7d41e53 100644
---- a/scd/app.c
-+++ b/scd/app.c
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <npth.h>
-+#include <unistd.h>
- 
- #ifndef HAVE_W32_SYSTEM
- #include <fcntl.h>		/* F_SETFD F_GETFL F_SETFL O_NONBLOCK fcntl(2) */
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.2.bb b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
index 64c63e31ce7..8e87382f129 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.2.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
@@ -18,7 +18,6 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0002-use-pkgconfig-instead-of-npth-config.patch \
            file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
            file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
-           file://0001-fix-compile-failure-with-musl.patch \
            "
 SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
                                 file://relocate.patch"