[arch-commits] Commit in bluez/trunk (2 files)

[Andreas Radke]

    Date: Tuesday, November 19, 2013 @ 23:14:52
  Author: andyrtr
Revision: 199941

prepare next release

Added:
  bluez/trunk/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
Modified:
  bluez/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch |   59 ++++++++++
 PKGBUILD                                                        |   15 ++
 2 files changed, 71 insertions(+), 3 deletions(-)

Added: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
===================================================================
--- 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch	                        (rev 0)
+++ 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch	2013-11-19 22:14:52 UTC (rev 199941)
@@ -0,0 +1,59 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw at public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1
+
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-19 21:23:09 UTC (rev 199940)
+++ PKGBUILD	2013-11-19 22:14:52 UTC (rev 199941)
@@ -10,15 +10,24 @@
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+makedepends=('dbus' 'libical' 'systemd' 'readline')
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2
+        0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
         bluetooth.modprobe)
 md5sums=('c3675ed157a433b6de7391854b907b8c'
+         'ec97f23123456900446e8ab17361d6c2'
          '671c15e99d7154c2df987b71c5851b3d')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # patch not upstreamable for obex file transfer - FS#37773 taken from FC
+  # http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html
+  patch -Np1 -i ${srcdir}/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+  autoreconf -vfi
+}
+
 build() {
   cd ${pkgname}-${pkgver}
-
   ./configure \
           --prefix=/usr \
           --mandir=/usr/share/man \