Skip to content
Snippets Groups Projects
Commit ed9d7582 authored by Jan de Groot's avatar Jan de Groot
Browse files

upgpkg: 3.15.92-1

parent c4e43dbf
No related branches found
No related tags found
No related merge requests found
# Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gcr pkgname=gcr
pkgver=3.15.90 pkgver=3.15.92
pkgrel=1 pkgrel=1
pkgdesc="A library for bits of crypto UI and parsing" pkgdesc="A library for bits of crypto UI and parsing"
arch=(i686 x86_64) arch=(i686 x86_64)
...@@ -13,16 +13,9 @@ makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt') ...@@ -13,16 +13,9 @@ makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt')
options=('!makeflags') options=('!makeflags')
install=gcr.install install=gcr.install
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
10-gcr.conf 10-gcr.conf)
skip-annotation-gck_object_cache_get_attributes.patch) sha256sums=('ebdb15ef5277b0e66863649a7bccde60f8e20d3ceed8be976878b46cf129e012'
sha256sums=('b0ad0cfb9f504cda67e740f79a53b5d19c9814a07b7f257d47fbf0409376efe2' '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
'5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc'
'cc4056b4cdb79ce7804ae7562d62ff108a39244bd0fe673fec8c1aa4bf193411')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i ../skip-annotation-gck_object_cache_get_attributes.patch
}
build() { build() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
......
From 05ab60fb80ec9e1eafb6859f050de32269cdddc2 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment