From a7006e880ca2c68f36f3a1d8db1c0cf844f5fbcb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 23 Feb 2023 20:42:46 +0100 Subject: [PATCH] libcryptui: fix build with gpg 2.4 --- .../patches/git_allow-gpg2-2.1.patch | 25 ------------------- .../patches/git_allow-gpg2-2.3.patch | 25 ------------------- .../patches/support-new-gpg-versions.patch | 11 ++++++++ 3 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/libcryptui/patches/git_allow-gpg2-2.1.patch delete mode 100644 srcpkgs/libcryptui/patches/git_allow-gpg2-2.3.patch create mode 100644 srcpkgs/libcryptui/patches/support-new-gpg-versions.patch diff --git a/srcpkgs/libcryptui/patches/git_allow-gpg2-2.1.patch b/srcpkgs/libcryptui/patches/git_allow-gpg2-2.1.patch deleted file mode 100644 index ab840a25874..00000000000 --- a/srcpkgs/libcryptui/patches/git_allow-gpg2-2.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sat, 17 Oct 2015 08:52:35 +0200 -Subject: Allow building with gnupg 2.1. - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 406b9f3..b621b23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -cgit v0.12 - diff --git a/srcpkgs/libcryptui/patches/git_allow-gpg2-2.3.patch b/srcpkgs/libcryptui/patches/git_allow-gpg2-2.3.patch deleted file mode 100644 index e83480bde70..00000000000 --- a/srcpkgs/libcryptui/patches/git_allow-gpg2-2.3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fa3b8fd3b55768e0e02b30948c29a9504d02522e Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Tue, 31 Aug 2021 13:46:10 +0000 -Subject: [PATCH] Accept GnuPG 2.3.x as supported version - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index be5b28b4..12df80ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0 2.1 2.2" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -GitLab - diff --git a/srcpkgs/libcryptui/patches/support-new-gpg-versions.patch b/srcpkgs/libcryptui/patches/support-new-gpg-versions.patch new file mode 100644 index 00000000000..1223a2c7700 --- /dev/null +++ b/srcpkgs/libcryptui/patches/support-new-gpg-versions.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, + DO_CHECK=$enableval, DO_CHECK=yes) + + if test "$DO_CHECK" = "yes"; then +- accepted_versions="1.2 1.4 2.0" ++ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3 2.4" + AC_PATH_PROGS(GNUPG, [gpg gpg2], no) + AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) + ok="no"