[arch-commits] Commit in gvfs/trunk (PKGBUILD fix_dbus_service.patch)

[Ionut Biru]

    Date: Tuesday, February 23, 2010 @ 18:30:41
  Author: ibiru
Revision: 70013

fix dbus services

Added:
  gvfs/trunk/fix_dbus_service.patch
Modified:
  gvfs/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   11 +++++++----
 fix_dbus_service.patch |   24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-23 22:45:28 UTC (rev 70012)
+++ PKGBUILD	2010-02-23 23:30:41 UTC (rev 70013)
@@ -3,7 +3,7 @@
 
 pkgname=gvfs
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,11 +12,14 @@
 install=gvfs.install
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.5/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c7e23851681875a04bd6697657433a204be9e6895a845ca3cb5ee573ca17ab02')
-
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.5/${pkgname}-${pkgver}.tar.bz2
+	fix_dbus_service.patch)
+sha256sums=('c7e23851681875a04bd6697657433a204be9e6895a845ca3cb5ee573ca17ab02'
+	    'ee428390392f4c184a4069b3a6955a65ffcafe0c14be053a71cb509eabb409d4')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/fix_dbus_service.patch || return 1
+  autoreconf -fi || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs || return 1

Added: fix_dbus_service.patch
===================================================================
--- fix_dbus_service.patch	                        (rev 0)
+++ fix_dbus_service.patch	2010-02-23 23:30:41 UTC (rev 70013)
@@ -0,0 +1,24 @@
+From d489b1d29f51f2d7d4caacaaca5232660c1da970 Mon Sep 17 00:00:00 2001
+From: Christian Kellner <gicmo at gnome.org>
+Date: Tue, 23 Feb 2010 11:58:53 +0000
+Subject: Fix with-dbus-service-dir configure switch
+
+Got broken by the commit 9936956378f295a12b05b5194af2397be2a9c94f
+---
+diff --git a/configure.ac b/configure.ac
+index 0340b4e..8425190 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,8 +48,8 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.23.4 gthread-2.0 gobject-2.0 gmodule-no-ex
+ PKG_CHECK_MODULES(DBUS, dbus-1)
+ 
+ AC_ARG_WITH(dbus_service_dir,
+-		AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files]),
+-		[default=PREFIX/share/dbus-1/services]], with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
++		AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]),
++            with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
+ DBUS_SERVICE_DIR=$with_dbus_service_dir
+ AC_SUBST(DBUS_SERVICE_DIR)
+ 
+--
+cgit v0.8.3.1