From c5b293affd75ce1a8c832e99b824b7374e61129d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 8 Sep 2014 14:41:56 +0000
Subject: main/gnome-keyring: upgrade to 3.12.2

---
 main/gnome-keyring/APKBUILD        | 43 ++++++++++----------------------------
 main/gnome-keyring/egg-asn1x.patch | 27 ------------------------
 2 files changed, 11 insertions(+), 59 deletions(-)
 delete mode 100644 main/gnome-keyring/egg-asn1x.patch

diff --git a/main/gnome-keyring/APKBUILD b/main/gnome-keyring/APKBUILD
index 369c3a0e8..cb56f213a 100644
--- a/main/gnome-keyring/APKBUILD
+++ b/main/gnome-keyring/APKBUILD
@@ -1,35 +1,20 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnome-keyring
-pkgver=2.32.1
-pkgrel=4
+pkgver=3.12.2
+pkgrel=0
 pkgdesc="GNOME keyring"
 url="http://www.gnome.org"
 arch="all"
 license="GPL"
 depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     libwnck-dev
-
-	     libgcrypt-dev
-	     libtasn1-dev
-
-	     libxcursor-dev
-	     libxcomposite-dev
-	     libxi-dev
-	     libxau-dev
-	     libxdmcp-dev
-	     libxext-dev
-	     libxcb-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev"
+depends_dev="gtk+3.0-dev
+	gcr-dev
+	libcap-ng-dev"
+makedepends="$depends_dev gtk-doc intltool gobject-introspection-dev"
 install=
-subpackages="$pkgname-dev"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-	egg-asn1x.patch
+subpackages="$pkgname-lang"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
 	fix-includes.patch
 	"
 
@@ -38,7 +23,6 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
-	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -48,8 +32,6 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	# build fails on eglibc when using ccache
-	[ "$ALPINE_LIBC" = "eglibc" ] && export CC="/usr/bin/gcc"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -67,12 +49,9 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="9a8aa74e03361676f29d6e73155786fc  gnome-keyring-2.32.1.tar.bz2
-ab08614f54aa38fabecbf1e18c6b3518  egg-asn1x.patch
+md5sums="63db70619f58e9cbd70c0b7d2285f26f  gnome-keyring-3.12.2.tar.xz
 e70751be048bf0debabc6d3c5d10658e  fix-includes.patch"
-sha256sums="31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9  gnome-keyring-2.32.1.tar.bz2
-081c4a213618e0c96a9f649f6987597f2a89f7fd0fc2c91ae29dde4442a9e60b  egg-asn1x.patch
+sha256sums="3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c  gnome-keyring-3.12.2.tar.xz
 eeab3d71e26585d65f40f443486177cde05d4819f8457e1ab24c7075c389cc6b  fix-includes.patch"
-sha512sums="23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b  gnome-keyring-2.32.1.tar.bz2
-a2b24073a4e9d2a131cb49dc83ed8a7dab04ea15bd1e3d7b0ffbddf0e55ea42869f171393e643213fe79bc7981fd4b3bb7c7bbd1199fec8c5d82545fbc19099e  egg-asn1x.patch
+sha512sums="e8e095904e63f589cdc30818ecab7938e42750054880f1fc01dfbb39375ae56a4497158309717b726594e54ad2604eaeedd8a8ed73697b4c348185f32af17457  gnome-keyring-3.12.2.tar.xz
 99af8b23c8b53bc1e70f921c872563b779c1ec59db72474b62e6d693f0d82d38b94607c8b9d53e751cf4a44873c91e283bc27d69f37433a37aa40e990caa1249  fix-includes.patch"
diff --git a/main/gnome-keyring/egg-asn1x.patch b/main/gnome-keyring/egg-asn1x.patch
deleted file mode 100644
index d36b0489a..000000000
--- a/main/gnome-keyring/egg-asn1x.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./egg/egg-asn1x.h.orig	2013-01-15 12:35:55.308701917 +0000
-+++ ./egg/egg-asn1x.h	2013-01-15 12:41:45.224900393 +0000
-@@ -25,6 +25,7 @@
- #define EGG_ASN1X_H_
- 
- #include <glib.h>
-+#include <libtasn1.h>
- 
- #ifndef HAVE_EGG_ALLOCATOR
- typedef void* (*EggAllocator) (void* p, gsize);
-@@ -35,13 +36,13 @@
- 
- struct static_struct_asn;
- 
--GNode*              egg_asn1x_create                 (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create                 (const ASN1_ARRAY_TYPE *defs,
-                                                       const gchar *type);
- 
--GNode*              egg_asn1x_create_quark           (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create_quark           (const ASN1_ARRAY_TYPE *defs,
-                                                       GQuark type);
- 
--GNode*              egg_asn1x_create_and_decode      (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create_and_decode      (const ASN1_ARRAY_TYPE *defs,
-                                                       const gchar *type,
-                                                       gconstpointer data,
-                                                       gsize n_data);
-- 
cgit v1.2.3