Accepting request 121490 from GNOME:Factory

Fix build... with a patch from upstream (forwarded request 121489 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/121490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=74
This commit is contained in:
Stephan Kulow 2012-05-22 06:19:11 +00:00 committed by Git OBS Bridge
commit 7040357bd5
3 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,22 @@
From f8a0cfcfc78f487447a347309affa6acadcfe77f Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
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

View File

@ -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

View File

@ -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