[arch-commits] Commit in gcr/trunk (2 files)

[Jan de Groot]

    Date: Sunday, March 8, 2015 @ 16:36:16
  Author: jgc
Revision: 233091

upgpkg: gcr 3.15.90-1

Added:
  gcr/trunk/skip-annotation-gck_object_cache_get_attributes.patch
Modified:
  gcr/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |   19 ++++++---
 skip-annotation-gck_object_cache_get_attributes.patch |   33 ++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-08 15:31:27 UTC (rev 233090)
+++ PKGBUILD	2015-03-08 15:36:16 UTC (rev 233091)
@@ -2,7 +2,7 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=gcr
-pkgver=3.14.0
+pkgver=3.15.90
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64)
@@ -10,14 +10,21 @@
 license=('GPL2')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt'
          'p11-kit')
-makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt' 'python2')
+makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt')
 options=('!makeflags')
 install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        10-gcr.conf)
-sha256sums=('2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d'
-            '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        10-gcr.conf
+        skip-annotation-gck_object_cache_get_attributes.patch)
+sha256sums=('b0ad0cfb9f504cda67e740f79a53b5d19c9814a07b7f257d47fbf0409376efe2'
+            '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc'
+            'cc4056b4cdb79ce7804ae7562d62ff108a39244bd0fe673fec8c1aa4bf193411')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i ../skip-annotation-gck_object_cache_get_attributes.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \

Added: skip-annotation-gck_object_cache_get_attributes.patch
===================================================================
--- skip-annotation-gck_object_cache_get_attributes.patch	                        (rev 0)
+++ skip-annotation-gck_object_cache_get_attributes.patch	2015-03-08 15:36:16 UTC (rev 233091)
@@ -0,0 +1,33 @@
+From 05ab60fb80ec9e1eafb6859f050de32269cdddc2 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Thu, 5 Mar 2015 09:17:41 +0100
+Subject: Add (skip) annotation to gck_object_cache_get_attributes
+
+This works around a bug in vala 0.27.1/git master where it would call
+this method in the implementation of Pkcs11Certificate::set_property in
+seahorse. This causes an infinite loop as
+Pkcs11Certificate is an implementation of the GckObjectCacheInterface,
+so calling gck_object_cache_get_attributes() for ::set_property which in
+turn calls g_object_set(self, "attributes", value, NULL); is going to
+loop.
+
+This can be reverted once vala is fixed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=745629
+
+diff --git a/gck/gck-object-cache.c b/gck/gck-object-cache.c
+index 2325bfa..8da15cb 100644
+--- a/gck/gck-object-cache.c
++++ b/gck/gck-object-cache.c
+@@ -83,7 +83,7 @@ gck_object_cache_default_init (GckObjectCacheIface *iface)
+ }
+ 
+ /**
+- * gck_object_cache_get_attributes:
++ * gck_object_cache_get_attributes: (skip):
+  * @object: an object with an attribute cache
+  *
+  * Gets the attributes cached on this object.
+-- 
+cgit v0.10.2
+