diff --git a/Allow-building-with-GnuPG-2.4.x.patch b/Allow-building-with-GnuPG-2.4.x.patch new file mode 100644 index 0000000..d19e6ea --- /dev/null +++ b/Allow-building-with-GnuPG-2.4.x.patch @@ -0,0 +1,22 @@ +From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +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 = [ diff --git a/seahorse.spec b/seahorse.spec index 8a47683..8871e17 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,11 +1,13 @@ Name: seahorse Version: 41.0 -Release: 1 +Release: 2 Summary: A GNOME application for managing encryption keys License: GPLv2+ and LGPLv2+ URL: https://wiki.gnome.org/Apps/Seahorse Source: https://download.gnome.org/sources/%{name}/41/%{name}-%{version}.tar.xz +# https://github.com/GNOME/seahorse/commit/9260c74779be3d7a378db0671af862ffa3573d42 +Patch0: Allow-building-with-GnuPG-2.4.x.patch BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib) pkgconfig(gio-2.0) BuildRequires: pkgconfig(gck-1) pkgconfig(gcr-3) pkgconfig(gtk+-3.0) @@ -54,6 +56,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.seahorse.A %{_mandir}/man1/*.1* %changelog +* Thu Jul 20 2023 yaoxin - 41.0-2 +- Fix build error caused by gnupg2 update to 2.4.3 + * Fri Apr 8 2022 yaoxin - 41.0-1 - Resolve compilation failures