bluez: patch to fix obex file transfers in gnome-bluetooth and others.

See http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html
This commit is contained in:
Juan RP 2014-05-12 08:38:42 +02:00
parent 2117a2cbc1
commit 2411ac62ee
2 changed files with 64 additions and 2 deletions

View File

@ -0,0 +1,59 @@
From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@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
--- Makefile.obexd
+++ 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
--- 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
+++ 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

View File

@ -1,12 +1,12 @@
# Template file for 'bluez'
pkgname=bluez
version=5.18
revision=1
revision=2
build_style=gnu-configure
configure_args="--with-udevdir=/usr/lib/udev
--with-systemdsystemunitdir=/usr/lib/systemd/system
--enable-pie --enable-threads --enable-library"
hostmakedepends="pkg-config flex"
hostmakedepends="automake libtool pkg-config flex"
makedepends="libglib-devel libudev-devel>=183 dbus-devel systemd-devel
cups-devel libical-devel readline-devel>=6.3"
conf_files="/etc/bluetooth/main.conf"
@ -18,6 +18,9 @@ license="GPL-2"
distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
checksum=8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340
pre_configure() {
autoreconf -fi
}
post_install() {
vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
}