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

_service

@@ -3,11 +3,11 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/seahorse.git</param>
-    <param name="revision">main</param>
+    <param name="revision">1ecd8e22d86e02adab9f77b0d1216018b726298c</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">v?(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
-<!--    <param name="changesgenerate">enable</param> -->
+    <param name="changesgenerate">enable</param>
   </service>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/seahorse.git</param>
+              <param name="changesrevision">1ecd8e22d86e02adab9f77b0d1216018b726298c</param></service></servicedata>

seahorse-43.0+22.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ade0c56aaaf286a62f7c8165701797e96c4f26abb8b4dab03887c447127330f3
-size 12644877

seahorse-47.0.1-gpgme-2.patch

@@ -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
+

seahorse-gcc14.patch

@@ -1,25 +0,0 @@
-From 4110a2389bf9728b8f0c9b216b0a5843de806e4a Mon Sep 17 00:00:00 2001
-From: ppw 0 <ppw0@tuta.io>
-Date: Wed, 6 Dec 2023 12:16:45 +0000
-Subject: [PATCH] Update file operation.vala
-
----
- ssh/operation.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssh/operation.vala b/ssh/operation.vala
-index 4743d0a5..48a525c3 100644
---- a/ssh/operation.vala
-+++ b/ssh/operation.vala
-@@ -49,7 +49,7 @@ public abstract class Operation : GLib.Object {
-     protected async string? operation_async(string command,
-                                             string? input,
-                                             Cancellable? cancellable) throws GLib.Error {
--        return_val_if_fail (command != null && command != "", null);
-+        return_val_if_fail (command != null && command != "", false);
- 
-         // Strip the command name for logging purposes
-         string[] args;
--- 
-GitLab
-

seahorse.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+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
+
+- Update to version 47.0.1+6:
+  * build:
+    - Fix config.h target
+    - Fix symbolic icon name
+  * Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep 18 12:53:35 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 47.0.1:
+  + Do a better job of passing on the app icon to the window
+    manager, so it appropriately shows up when one of its windows
+    is focused.
+  + Add support for GnuPG 2.4 and 2.5.
+  + Try to show a bit more info when showing a password from some
+    apps, like Evolution and Remmina.
+  + Several build fixes.
+  + Updated translations.
+- Drop seahorse-gcc14.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Jun  4 19:37:12 UTC 2024 - Michael Gorse <mgorse@suse.com>
 

seahorse.obsinfo

@@ -1,4 +1,4 @@
 name: seahorse
-version: 43.0+22
+version: 47.0.1+6
-mtime: 1708971802
+mtime: 1729275525
-commit: 0f4cb1f4f421af4a0e1c240f012e915c4e3d59b3
+commit: 1ecd8e22d86e02adab9f77b0d1216018b726298c

seahorse.spec

@@ -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
@@ -17,15 +18,14 @@
 
 
 Name:           seahorse
-Version:        43.0+22
+Version:        47.0.1+6
 Release:        0
 Summary:        GNOME interface for gnupg
 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
-# PATCH-FIX-UPSTREAM seahorse-gcc14.patch boo#1225926 mgorse@suse.com -- fix an invalid cast.
+Patch0:         seahorse-47.0.1-gpgme-2.patch
-Patch0:         seahorse-gcc14.patch
 BuildRequires:  appstream-glib
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-xsl-stylesheets