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

[Ionut Biru]

    Date: Sunday, May 2, 2010 @ 13:29:10
  Author: ibiru
Revision: 79300

upgpkg: gnome-keyring 2.30.1-2
backport the fix for adding service for org.freedesktop.secrets.

Added:
  gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_1.patch
  gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_2.patch
Modified:
  gnome-keyring/trunk/PKGBUILD

-------------------------------------------------+
 PKGBUILD                                        |   14 ++++++-
 add_service_for_org.freedesktop.secrets_1.patch |   40 ++++++++++++++++++++++
 add_service_for_org.freedesktop.secrets_2.patch |   21 +++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-02 17:10:34 UTC (rev 79299)
+++ PKGBUILD	2010-05-02 17:29:10 UTC (rev 79300)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-keyring
 pkgver=2.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -12,11 +12,19 @@
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+        add_service_for_org.freedesktop.secrets_1.patch
+	add_service_for_org.freedesktop.secrets_2.patch)
+sha256sums=('a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a'
+            '4172736975e9b3edb7e7aeaff11effea2a6bd9165059d977111083ad7624ad51'
+	    '4afad6d8e84731a85162f82c995128cc0b36b3db239ef7dce1a2f742a7fe9b68')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_1.patch || return 1
+  patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_2.patch || return 1
+  autoconf || return 1
+  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring \

Added: add_service_for_org.freedesktop.secrets_1.patch
===================================================================
--- add_service_for_org.freedesktop.secrets_1.patch	                        (rev 0)
+++ add_service_for_org.freedesktop.secrets_1.patch	2010-05-02 17:29:10 UTC (rev 79300)
@@ -0,0 +1,40 @@
+From b36d6beeb2fa430210c8a2aa19f772bd75325e42 Mon Sep 17 00:00:00 2001
+From: Rob Bradford <rob at linux.intel.com>
+Date: Wed, 14 Apr 2010 18:12:41 +0000
+Subject: Add dbus activation service file for org.freedesktop.secrets
+
+Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=611002
+---
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index be96523..4c95b5a 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -54,14 +54,16 @@ gnome_keyring_daemon_LDADD = \
+ 
+ EXTRA_DIST = \
+ 	org.gnome.keyring.service.in \
++	org.freedesktop.secrets.service.in \
+ 	$(desktop_in_files)
+ 
+ CLEANFILES = \
+ 	org.gnome.keyring.service \
++	org.freedesktop.service \
+ 	$(desktop_DATA)
+ 
+ servicedir       = $(DBUS_SERVICES_DIR)
+-service_in_files = org.gnome.keyring.service.in
++service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in
+ service_DATA     = $(service_in_files:.service.in=.service)
+ service_PATH     = $(VALGRIND_RUN)$(bindir)
+ 
+diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in
+new file mode 100644
+index 0000000..d4db713
+--- a/dev/null
++++ b/daemon/org.freedesktop.secrets.service.in
+@@ -0,0 +1,3 @@
++[D-BUS Service]
++Name=org.freedesktop.secrets
++Exec=@PATH@/gnome-keyring-daemon --start --foreground --components=secrets
+--
+cgit v0.8.3.1

Added: add_service_for_org.freedesktop.secrets_2.patch
===================================================================
--- add_service_for_org.freedesktop.secrets_2.patch	                        (rev 0)
+++ add_service_for_org.freedesktop.secrets_2.patch	2010-05-02 17:29:10 UTC (rev 79300)
@@ -0,0 +1,21 @@
+From d6bb94e9c05072fc791fb5045f5b1ab22d11d916 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Mon, 19 Apr 2010 13:47:26 +0000
+Subject: Make sure the service files are created correctly
+
+---
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index 4c95b5a..9edb13f 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -68,7 +68,7 @@ service_DATA     = $(service_in_files:.service.in=.service)
+ service_PATH     = $(VALGRIND_RUN)$(bindir)
+ 
+ # Rule to make the service file with bindir expanded
+-$(service_DATA): $(service_in_files) Makefile
++%.service: %.service.in Makefile
+ 	@sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
+ 
+ desktop_in_files = \
+--
+cgit v0.8.3.1