[packages/seahorse] upstream fix for gpgme >= 2
atler
atler at pld-linux.org
Tue Aug 5 20:42:37 CEST 2025
commit f0df624a36bbf2c0cafd4eafcada939aca7b110e
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Aug 5 20:41:29 2025 +0200
upstream fix for gpgme >= 2
gpgme2.patch | 27 +++++++++++++++++++++++++++
seahorse.spec | 2 ++
2 files changed, 29 insertions(+)
---
diff --git a/seahorse.spec b/seahorse.spec
index 47d86d2..2fc7f82 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -8,6 +8,7 @@ Group: X11/Applications
Source0: https://download.gnome.org/sources/seahorse/47/%{name}-%{version}.tar.xz
# Source0-md5: 18cd36abd8d2e25c236934be64c8b916
Patch0: no-cache-update.patch
+Patch1: gpgme2.patch
URL: https://wiki.gnome.org/Apps/Seahorse
BuildRequires: avahi-devel >= 0.6
BuildRequires: avahi-glib-devel >= 0.6
@@ -102,6 +103,7 @@ Ten pakiet integruje Seahorse z wyszukiwarką gnome shell
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%build
%meson \
diff --git a/gpgme2.patch b/gpgme2.patch
new file mode 100644
index 0000000..d6004c5
--- /dev/null
+++ b/gpgme2.patch
@@ -0,0 +1,27 @@
+From aa68522cc696fa491ccfdff735b77bcf113168d0 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111 at xry111.site>
+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.
+---
+ pgp/seahorse-gpgme.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pgp/seahorse-gpgme.c b/pgp/seahorse-gpgme.c
+index 5203c83a..9b2b3c10 100644
+--- 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/seahorse.git/commitdiff/2d88659a619166ffa48bd6b24be3371539b3df6a
More information about the pld-cvs-commit
mailing list