[arch-commits] Commit in libgnome-keyring/trunk (3 files)

[Jan de Groot]

    Date: Tuesday, September 28, 2010 @ 02:50:31
  Author: jgc
Revision: 91799

upgpkg: libgnome-keyring 2.32.0-1
Update to 2.32.0, remove outdated patches

Modified:
  libgnome-keyring/trunk/PKGBUILD
Deleted:
  libgnome-keyring/trunk/eggdbus-remove.patch
  libgnome-keyring/trunk/keyring-fix-threading.patch

-----------------------------+
 PKGBUILD                    |   10 +++++-----
 eggdbus-remove.patch        |   21 ---------------------
 keyring-fix-threading.patch |   34 ----------------------------------
 3 files changed, 5 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-28 06:25:42 UTC (rev 91798)
+++ PKGBUILD	2010-09-28 06:50:31 UTC (rev 91799)
@@ -2,17 +2,17 @@
 #Maintainer: Jan De Groot <jgc at archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=2.31.92
+pkgver=2.32.0
 pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('dbus-core>=1.4.0' 'libgcrypt>=1.4.6' 'glib2>=2.25.15')
-makedepends=('intltool' 'pkgconfig' 'python' 'gtk-doc')
+depends=('dbus-core>=1.4.0' 'libgcrypt>=1.4.6' 'glib2>=2.26.0')
+makedepends=('intltool' 'pkgconfig' 'python2' 'gtk-doc')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.31/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f49ec4eb9efd2255eb45bbe3e71a132857d65f1c56d8f437c85371980da9c44a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Deleted: eggdbus-remove.patch
===================================================================
--- eggdbus-remove.patch	2010-09-28 06:25:42 UTC (rev 91798)
+++ eggdbus-remove.patch	2010-09-28 06:50:31 UTC (rev 91799)
@@ -1,21 +0,0 @@
-From d2f57865d2b80ab301aba35278e71b85a1a141cd Mon Sep 17 00:00:00 2001
-From: Stef Walter <stef at memberwebs.com>
-Date: Thu, 10 Jun 2010 14:43:48 +0000
-Subject: Remove erroneus egg-dbus dependency.
-
----
-diff --git a/configure.in b/configure.in
-index 16a5807..3906f9e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -85,7 +85,7 @@ AC_CHECK_FUNCS(mlock)
- #
- 
- DBUS_REQUIRED=1.0
--PKG_CHECK_MODULES([DBUS], dbus-1 >= 1.0 eggdbus-1 >= 0.4)
-+PKG_CHECK_MODULES([DBUS], dbus-1 >= 1.0)
- 
- DBUS_VERSION=`$PKG_CONFIG --modversion dbus-1`
- DBUS_MAJOR_VERSION=`echo $DBUS_VERSION | cut -d. -f1`
---
-cgit v0.8.3.1

Deleted: keyring-fix-threading.patch
===================================================================
--- keyring-fix-threading.patch	2010-09-28 06:25:42 UTC (rev 91798)
+++ keyring-fix-threading.patch	2010-09-28 06:50:31 UTC (rev 91799)
@@ -1,34 +0,0 @@
-From 78f80470e8f2318334d1022925bb91966e6a192f Mon Sep 17 00:00:00 2001
-From: Stef Walter <stef at memberwebs.com>
-Date: Tue, 22 Jun 2010 02:38:32 +0000
-Subject: Stop gap fix for threading problem in gnome_keyring_is_available()
-
- * This will be fixed more fully in master.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=616512
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index 9c8486a..c41de42 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -483,6 +483,7 @@ gnome_keyring_is_available (void)
- {
- 	GkrOperation *op;
- 	DBusMessage *req;
-+	gboolean ret;
- 
- 	req = dbus_message_new_method_call (gkr_service_name (), SERVICE_PATH,
- 	                                    DBUS_INTERFACE_PEER, "Ping");
-@@ -490,8 +491,9 @@ gnome_keyring_is_available (void)
- 	op = gkr_operation_new (gkr_callback_empty, GKR_CALLBACK_RES, NULL, NULL);
- 	gkr_operation_request (op, req);
- 	dbus_message_unref (req);
-+	ret = gkr_operation_block (op) == GNOME_KEYRING_RESULT_OK;
- 	gkr_operation_unref (op);
--	return gkr_operation_block (op) == GNOME_KEYRING_RESULT_OK;
-+	return ret;
- }
- 
- /**
---
-cgit v0.8.3.1