From 83a4d2aefab0aa5d288beda1a406fc2c6a9be26c9e3c110752e1d5462168c214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Fri, 6 Jan 2023 19:02:01 +0000
Subject: [PATCH] Accepting request 1056358 from home:dimstar:Factory

- Add 9260c747.patch: Allow building with GnuPG-2.4.x.

OBS-URL: https://build.opensuse.org/request/show/1056358
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=225
---
 9260c747.patch   | 25 +++++++++++++++++++++++++
 seahorse.changes |  5 +++++
 seahorse.spec    |  5 +++--
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 9260c747.patch

diff --git a/9260c747.patch b/9260c747.patch
new file mode 100644
index 0000000..d9160c6
--- /dev/null
+++ b/9260c747.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+ 
+ glib_deps = [
+-- 
+GitLab
+
diff --git a/seahorse.changes b/seahorse.changes
index 57d696c..3bebb28 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan  6 09:29:28 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 9260c747.patch: Allow building with GnuPG-2.4.x.
+
 -------------------------------------------------------------------
 Mon Dec 12 22:49:41 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/seahorse.spec b/seahorse.spec
index 68ce974..9823d37 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package seahorse
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,8 @@ 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:        https://download.gnome.org/sources/seahorse/43/%{name}-%{version}.tar.xz
-
+# PATCH-FIX-UPSTREAM 9260c747.patch dimstar@opensuse.org -- Allow building with GnuPG-2.4.x
+Patch0:         https://gitlab.gnome.org/GNOME/seahorse/-/commit/9260c747.patch
 BuildRequires:  appstream-glib
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-xsl-stylesheets