commit:     f9c0904665c05ff86bbcd5720a482122a555bc80
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 21:51:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 21:51:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c09046

app-crypt/seahorse: fix build w/ gnupg 2.4

Closes: https://bugs.gentoo.org/887599
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../seahorse/files/seahorse-43.0-gnupg-2.4.patch     | 20 ++++++++++++++++++++
 app-crypt/seahorse/seahorse-43.0.ebuild              |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app-crypt/seahorse/files/seahorse-43.0-gnupg-2.4.patch 
b/app-crypt/seahorse/files/seahorse-43.0-gnupg-2.4.patch
new file mode 100644
index 000000000000..034da78fb284
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-43.0-gnupg-2.4.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/889362
+https://gitlab.gnome.org/GNOME/seahorse/-/commit/9260c74779be3d7a378db0671af862ffa3573d42
+
+From: Xi Ruoyao <[email protected]>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+ 
+ glib_deps = [
+-- 
+GitLab

diff --git a/app-crypt/seahorse/seahorse-43.0.ebuild 
b/app-crypt/seahorse/seahorse-43.0.ebuild
index 2888ec41da23..9c514916a23e 100644
--- a/app-crypt/seahorse/seahorse-43.0.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,6 +47,10 @@ BDEPEND="
        virtual/pkgconfig
 "
 
+PATCHES=(
+       "${FILESDIR}"/${P}-gnupg-2.4.patch
+)
+
 src_prepare() {
        default
        vala_setup

Reply via email to