Accepting request 1285994 from GNOME:Factory

Fix build with gpgme >= 2.0.0 (boo#1244605) (forwarded request 1285819 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/1285994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=127
This commit is contained in:
2025-06-18 13:53:28 +00:00
committed by Git OBS Bridge
3 changed files with 35 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
From aa68522cc696fa491ccfdff735b77bcf113168d0 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@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

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jun 14 17:13:07 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- Fix build with gpgme >= 2.0.0 (boo#1244605)
add seahorse-47.0.1-gpgme-2.patch from upstream
-------------------------------------------------------------------
Wed Oct 30 16:05:31 UTC 2024 - bjorn.lie@gmail.com

View File

@@ -2,6 +2,7 @@
# spec file for package seahorse
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +25,7 @@ License: GFDL-1.1-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Security
URL: https://wiki.gnome.org/Apps/Seahorse
Source0: %{name}-%{version}.tar.zst
Patch0: seahorse-47.0.1-gpgme-2.patch
BuildRequires: appstream-glib
BuildRequires: desktop-file-utils
BuildRequires: docbook-xsl-stylesheets