From d8a1ccd4404a06e5d4b4e5357a6ad777fec17253d3144445a54ff92a7bb700a1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 18 May 2012 18:24:16 +0000 Subject: [PATCH] Accepting request 121489 from home:dimstar:branches:GNOME:Factory Fix build... with a patch from upstream OBS-URL: https://build.opensuse.org/request/show/121489 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=128 --- seahorse-gpgme-keyring.patch | 22 ++++++++++++++++++++++ seahorse.changes | 6 ++++++ seahorse.spec | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 seahorse-gpgme-keyring.patch diff --git a/seahorse-gpgme-keyring.patch b/seahorse-gpgme-keyring.patch new file mode 100644 index 0000000..05fe158 --- /dev/null +++ b/seahorse-gpgme-keyring.patch @@ -0,0 +1,22 @@ +From f8a0cfcfc78f487447a347309affa6acadcfe77f Mon Sep 17 00:00:00 2001 +From: Stef Walter +Date: Mon, 30 Apr 2012 18:29:42 +0000 +Subject: Fix typo in finalizing of GPGME keyring + +--- +diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c +index 79ff39b..579ab09 100644 +--- a/pgp/seahorse-gpgme-keyring.c ++++ b/pgp/seahorse-gpgme-keyring.c +@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object) + { + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object); + +- g_clear_object (self->pv->actions); ++ g_clear_object (&self->pv->actions); + g_hash_table_destroy (self->pv->keys); + + /* All monitoring and scheduling should be done */ +-- +cgit v0.9.0.2 + diff --git a/seahorse.changes b/seahorse.changes index 8a70afd..7dc68c6 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 18 18:18:48 UTC 2012 - dimstar@opensuse.org + +- Add seahorse-gpgme-keyring.patch: Fix typo in finalizing GPGME + keyring. + ------------------------------------------------------------------- Tue Apr 17 06:14:36 UTC 2012 - vuntz@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index 0521a57..a32199f 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.4/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM seahorse-gpgme-keyring.patch dimstar@opensuse.org -- Fix typo in finalizing of GPGME keyring, taken from git. +Patch0: seahorse-gpgme-keyring.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gpg2 @@ -56,6 +58,7 @@ Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build