| 1 |
commit: f9c0904665c05ff86bbcd5720a482122a555bc80 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 2 21:51:09 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 2 21:51:09 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c09046 |
| 7 |
|
| 8 |
app-crypt/seahorse: fix build w/ gnupg 2.4 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/887599 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../seahorse/files/seahorse-43.0-gnupg-2.4.patch | 20 ++++++++++++++++++++ |
| 14 |
app-crypt/seahorse/seahorse-43.0.ebuild | 6 +++++- |
| 15 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..034da78fb284 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-crypt/seahorse/files/seahorse-43.0-gnupg-2.4.patch |
| 22 |
@@ -0,0 +1,20 @@ |
| 23 |
+https://bugs.gentoo.org/889362 |
| 24 |
+https://gitlab.gnome.org/GNOME/seahorse/-/commit/9260c74779be3d7a378db0671af862ffa3573d42 |
| 25 |
+ |
| 26 |
+From: Xi Ruoyao <xry111@××××××.site> |
| 27 |
+Date: Wed, 21 Dec 2022 20:58:26 +0800 |
| 28 |
+Subject: [PATCH] Allow building with GnuPG-2.4.x |
| 29 |
+ |
| 30 |
+--- a/meson.build |
| 31 |
++++ b/meson.build |
| 32 |
+@@ -26,7 +26,7 @@ endif |
| 33 |
+ # Dependencies |
| 34 |
+ min_glib_version = '2.66' |
| 35 |
+ min_gcr_version = '3.38' |
| 36 |
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ] |
| 37 |
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ] |
| 38 |
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py') |
| 39 |
+ |
| 40 |
+ glib_deps = [ |
| 41 |
+-- |
| 42 |
+GitLab |
| 43 |
|
| 44 |
diff --git a/app-crypt/seahorse/seahorse-43.0.ebuild b/app-crypt/seahorse/seahorse-43.0.ebuild |
| 45 |
index 2888ec41da23..9c514916a23e 100644 |
| 46 |
--- a/app-crypt/seahorse/seahorse-43.0.ebuild |
| 47 |
+++ b/app-crypt/seahorse/seahorse-43.0.ebuild |
| 48 |
@@ -1,4 +1,4 @@ |
| 49 |
-# Copyright 1999-2022 Gentoo Authors |
| 50 |
+# Copyright 1999-2023 Gentoo Authors |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
EAPI=8 |
| 54 |
@@ -47,6 +47,10 @@ BDEPEND=" |
| 55 |
virtual/pkgconfig |
| 56 |
" |
| 57 |
|
| 58 |
+PATCHES=( |
| 59 |
+ "${FILESDIR}"/${P}-gnupg-2.4.patch |
| 60 |
+) |
| 61 |
+ |
| 62 |
src_prepare() { |
| 63 |
default |
| 64 |
vala_setup |
Archives