diff --git a/gkr-Use-0-on-empty-flags.patch b/gkr-Use-0-on-empty-flags.patch new file mode 100644 index 0000000..73ed905 --- /dev/null +++ b/gkr-Use-0-on-empty-flags.patch @@ -0,0 +1,30 @@ +From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001 +From: Niels De Graef +Date: Sat, 11 May 2019 09:02:34 +0200 +Subject: [PATCH] gkr: Use 0 on empty flags + +A Flags-type variable without any flag set can be replaced with 0, so +this is a safe thing to do. It also prevents us from having to deal with +the accidental API break in libsecret (see +https://gitlab.gnome.org/GNOME/libsecret/merge_requests/19) +--- + gkr/gkr-keyring-add.vala | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/gkr/gkr-keyring-add.vala b/gkr/gkr-keyring-add.vala +index 4e92a5207..f60c9a227 100644 +--- a/gkr/gkr-keyring-add.vala ++++ b/gkr/gkr-keyring-add.vala +@@ -41,8 +41,7 @@ public class Seahorse.Gkr.KeyringAdd : Gtk.Dialog { + + var cancellable = Dialog.begin_request(this); + var service = Backend.instance().service; +- Secret.Collection.create.begin(service, this.name_entry.text, null, +- Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE, ++ Secret.Collection.create.begin(service, this.name_entry.text, null, 0, + cancellable, (obj, res) => { + /* Clear the operation without cancelling it since it is complete */ + Dialog.complete_request(this, false); +-- +GitLab + diff --git a/seahorse.spec b/seahorse.spec index 6bf9654..01564f6 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,10 +1,13 @@ Name: seahorse Version: 3.30.1.1 -Release: 2 +Release: 3 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/seahorse/3.30/seahorse-%{version}.tar.xz + +Patch0001: gkr-Use-0-on-empty-flags.patch + BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib) pkgconfig(gio-2.0) BuildRequires: pkgconfig(gck-1) pkgconfig(gcr-3) pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libsecret-unstable) pkgconfig(libsoup-2.4) desktop-file-utils gettext @@ -50,5 +53,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/seahorse.desktop %exclude %{_datadir}/icons/hicolor/icon-theme.cache %changelog +* Wed Jul 29 2020 lingsheng - 3.30.1.1-3 +- fix build fail: gkr use 0 on empty flags + * Wed May 13 2020 yanan li - 3.30.1.1-2 - Package init