Fix build error caused by gnupg2 update to 2.4.3

This commit is contained in:
starlet-dx 2023-07-20 09:54:00 +08:00
parent a1e494b21c
commit cebb31ead1
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,22 @@
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 = [

View File

@ -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 <yao_xin001@hoperun.com> - 41.0-2
- Fix build error caused by gnupg2 update to 2.4.3
* Fri Apr 8 2022 yaoxin <yaoxin30@huawei.com> - 41.0-1
- Resolve compilation failures