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

[Jan de Groot]

    Date: Thursday, August 19, 2010 @ 06:26:11
  Author: jgc
Revision: 88033

upgpkg: libgnome-keyring 2.30.1-2
Add patches from gnome-2-30 branch, fixes thread issues and removes eggdbus dependency

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

-----------------------------+
 PKGBUILD                    |   16 ++++++++++++----
 eggdbus-remove.patch        |   21 +++++++++++++++++++++
 keyring-fix-threading.patch |   34 ++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-19 10:25:58 UTC (rev 88032)
+++ PKGBUILD	2010-08-19 10:26:11 UTC (rev 88033)
@@ -7,15 +7,23 @@
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('eggdbus>=0.6' 'libgcrypt>=1.4.6')
-makedepends=('intltool' 'pkgconfig' 'python')
+depends=('dbus-core>=1.2.24' 'libgcrypt>=1.4.6' 'glib2>=2.24.1')
+makedepends=('intltool' 'pkgconfig' 'python' 'gtk-doc')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a9227da7d3eee930b75ad7858875344b713d1bf73e6af54870a2691643d5dae4')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+        eggdbus-remove.patch
+        keyring-fix-threading.patch)
+sha256sums=('a9227da7d3eee930b75ad7858875344b713d1bf73e6af54870a2691643d5dae4'
+            'f962bc3b2407f63a0c5c8234f8a70e9885535c857a87414540860b830e908024'
+            '9a8b20b87fe595e26cb04ede3a26ef1a1ae8f0c7dcc2efc7a52961f70e453bd7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/eggdbus-remove.patch"
+  patch -Np1 -i "${srcdir}/keyring-fix-threading.patch"
+  libtoolize --force
+  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring

Added: eggdbus-remove.patch
===================================================================
--- eggdbus-remove.patch	                        (rev 0)
+++ eggdbus-remove.patch	2010-08-19 10:26:11 UTC (rev 88033)
@@ -0,0 +1,21 @@
+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

Added: keyring-fix-threading.patch
===================================================================
--- keyring-fix-threading.patch	                        (rev 0)
+++ keyring-fix-threading.patch	2010-08-19 10:26:11 UTC (rev 88033)
@@ -0,0 +1,34 @@
+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