mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
ddfb660f7b
- Fixed a bug in bluedevil (link to a .js file)
- Made bluez5 the default bluetooth service except for kde4
- created org.bluez.obex systemd dbus service
- Patched bluez5 using bluez-5.37-obexd_without_systemd-1.patch
in order to enable obex when using either the bluedevil plasmoid
or dolpin file manager within plasma workspaces 5.
The functionality was tested using a Sony Xperia Z, the machine
and the handset paired and two different files were sent in both
directions successfully.
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
Submitted By: Armin K. <krejzi at email dot com>
|
|
Date: 2013-04-29
|
|
Initial Package Version: 5.17
|
|
Upstream Status: unknown
|
|
Origin: Arch Linux (Giovanni Campagna)
|
|
Description: 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
|
|
|
|
|