* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libcryptui/, x11-libs/libcryptui/files/
@ 2022-06-05 18:10 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2022-06-05 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 95d5ebca22cbec7af4eca3670e60c7a38deb6ce8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 18:10:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 18:10:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d5ebca
x11-libs/libcryptui: allow gnupg 2.3
Closes: https://bugs.gentoo.org/820143
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libcryptui-3.12.2-gnupg-2.3.patch | 20 ++++++++++++++++++++
x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild | 7 +++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch
new file mode 100644
index 000000000000..5582b02fb552
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch
@@ -0,0 +1,20 @@
+https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1
+https://bugs.gentoo.org/820143
+
+From fa3b8fd3b55768e0e02b30948c29a9504d02522e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Tue, 31 Aug 2021 13:46:10 +0000
+Subject: [PATCH] Accept GnuPG 2.3.x as supported version
+
+--- 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/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
index f54b39147899..565dc4f52015 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,8 +50,11 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.12.2-fix-return-types.patch
"${FILESDIR}"/${PN}-3.12.2-port-gcr-3.patch
# Support GnuPG 2.2
- # https://bugs.gentoo.org/show_bug.cgi?id=629572
+ # https://bugs.gentoo.org/629572
"${FILESDIR}"/${PN}-3.12.2-gnupg-2.2.patch
+ # Support GnuPG 2.3
+ # https://bugs.gentoo.org/820143
+ "${FILESDIR}"/${PN}-3.12.2-gnupg-2.3.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-05 18:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-05 18:10 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libcryptui/, x11-libs/libcryptui/files/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox