summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-04-16 23:29:34 -0700
committerMatt Turner <mattst88@gentoo.org>2022-04-16 23:30:08 -0700
commitaea89bc6c8acd2a21a97025f6f6ed3afc25fdf18 (patch)
tree1127d4719f2e748e15623ef96e6cab2b955055b8 /app-crypt/seahorse
parentapp-crypt/seahorse: Reset environment to avoid dconf dep (diff)
downloadgentoo-aea89bc6c8acd2a21a97025f6f6ed3afc25fdf18.tar.gz
gentoo-aea89bc6c8acd2a21a97025f6f6ed3afc25fdf18.tar.bz2
gentoo-aea89bc6c8acd2a21a97025f6f6ed3afc25fdf18.zip
app-crypt/seahorse: Add patch to support GnuPG 2.3
Closes: https://bugs.gentoo.org/833513 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'app-crypt/seahorse')
-rw-r--r--app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch29
-rw-r--r--app-crypt/seahorse/seahorse-41.0-r1.ebuild4
2 files changed, 33 insertions, 0 deletions
diff --git a/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
new file mode 100644
index 000000000000..2d205e49a43f
--- /dev/null
+++ b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
@@ -0,0 +1,29 @@
+From 38a82911f9c35617e96587e59f796e4616d62483 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 22 Mar 2022 09:37:17 +0100
+Subject: [PATCH] meson: fix gpg version check for recent gnupg
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e3242323..12ce3d56 100644
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,10 @@ gpgme_dep = dependency('gpgme', version: '>= 1.14.0', required: get_option('pgp-
+
+ if get_option('pgp-support')
+ gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), accepted_gpg_versions ])
+- gpg_version = gpg_version_check.stdout()
++ # GnuPG now outputs e.g. 2.3.4-unknown so we need to drop this extra cruft
++ gpg_version_raw = gpg_version_check.stdout()
++ gpg_version_raw_split = gpg_version_raw.split('-')
++ gpg_version = gpg_version_raw_split[0]
+ message('GnuPG Version: @0@'.format(gpg_version))
+ if get_option('check-compatible-gpg') and gpg_version_check.returncode() != 0
+ error('Incompatible version of GnuPG. Accepted versions are: @0@'.format(accepted_gpg_versions))
+--
+2.35.1
+
diff --git a/app-crypt/seahorse/seahorse-41.0-r1.ebuild b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
index 8c62df24e60c..dbc4ba04ba9d 100644
--- a/app-crypt/seahorse/seahorse-41.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch
+)
+
src_prepare() {
default
vala_src_prepare