commit:     ca79c15597d6b4c0313a935041edb2363edea631
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 08:35:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 08:37:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca79c155

app-crypt/seahorse: fix build w/ gpgme-2

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

 .../seahorse/files/seahorse-47.0.1-gpgme-2.patch   | 23 ++++++++++++++++++++++
 app-crypt/seahorse/seahorse-47.0.1.ebuild          |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/app-crypt/seahorse/files/seahorse-47.0.1-gpgme-2.patch 
b/app-crypt/seahorse/files/seahorse-47.0.1-gpgme-2.patch
new file mode 100644
index 000000000000..b3242ce9f265
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-47.0.1-gpgme-2.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/961310
+https://gitlab.gnome.org/GNOME/seahorse/-/commit/aa68522cc696fa491ccfdff735b77bcf113168d0
+
+From aa68522cc696fa491ccfdff735b77bcf113168d0 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <[email protected]>
+Date: Wed, 4 Jun 2025 19:17:00 +0800
+Subject: [PATCH] pgp: Allow build with gpgme >= 2.0.0
+
+Since gpgme-2.0.0, GPGME_EVENT_NEXT_TRUSTITEM is removed.
+--- a/pgp/seahorse-gpgme.c
++++ b/pgp/seahorse-gpgme.c
+@@ -393,7 +393,9 @@ on_gpgme_event (void *user_data,
+               break;
+ 
+       case GPGME_EVENT_NEXT_KEY:
++#if GPGME_VERSION_NUMBER < 0x020000
+       case GPGME_EVENT_NEXT_TRUSTITEM:
++#endif
+       default:
+               /* Ignore unsupported event types */
+               break;
+-- 
+GitLab

diff --git a/app-crypt/seahorse/seahorse-47.0.1.ebuild 
b/app-crypt/seahorse/seahorse-47.0.1.ebuild
index 3b2c3f1bc7b5..222598f804db 100644
--- a/app-crypt/seahorse/seahorse-47.0.1.ebuild
+++ b/app-crypt/seahorse/seahorse-47.0.1.ebuild
@@ -48,6 +48,8 @@ BDEPEND="
 PATCHES=(
        # https://gitlab.gnome.org/GNOME/seahorse/-/issues/348
        "${FILESDIR}/${PN}-47.0.1-ldap-test.patch"
+       # https://bugs.gentoo.org/961310
+       "${FILESDIR}/${PN}-47.0.1-gpgme-2.patch"
 )
 
 src_prepare() {

Reply via email to