wok-next diff bluez/stuff/patches/bluez-5.48-obexd_without_systemd-1.patch @ rev 21402
updated php (7.4.4 -> 7.4.5)
author | Hans-G?nter Theisgen |
---|---|
date | Tue Apr 21 07:47:41 2020 +0100 (2020-04-21) |
parents | 2e9df1b30cc2 |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/bluez/stuff/patches/bluez-5.48-obexd_without_systemd-1.patch Tue Apr 21 07:47:41 2020 +0100 1.3 @@ -0,0 +1,61 @@ 1.4 +Submitted By: Armin K. <krejzi at email dot com> 1.5 +Date: 2013-04-29 1.6 +Initial Package Version: 5.17 1.7 +Upstream Status: unknown 1.8 +Origin: Arch Linux (Giovanni Campagna) 1.9 +Description: Allow using obexd without systemd in the user session 1.10 + 1.11 +Not all sessions run systemd --user (actually, the majority 1.12 +doesn't), so the dbus daemon must be able to spawn obexd 1.13 +directly, and to do so it needs the full path of the daemon. 1.14 +--- 1.15 + Makefile.obexd | 4 ++-- 1.16 + obexd/src/org.bluez.obex.service | 4 ---- 1.17 + obexd/src/org.bluez.obex.service.in | 4 ++++ 1.18 + 3 files changed, 6 insertions(+), 6 deletions(-) 1.19 + delete mode 100644 obexd/src/org.bluez.obex.service 1.20 + create mode 100644 obexd/src/org.bluez.obex.service.in 1.21 + 1.22 +diff --git a/Makefile.obexd b/Makefile.obexd 1.23 +index 3760867..142e7c3 100644 1.24 +--- a/Makefile.obexd 1.25 ++++ b/Makefile.obexd 1.26 +@@ -2,12 +2,12 @@ 1.27 + if SYSTEMD 1.28 + systemduserunitdir = @SYSTEMD_USERUNITDIR@ 1.29 + systemduserunit_DATA = obexd/src/obex.service 1.30 ++endif 1.31 + 1.32 + dbussessionbusdir = @DBUS_SESSIONBUSDIR@ 1.33 + dbussessionbus_DATA = obexd/src/org.bluez.obex.service 1.34 +-endif 1.35 + 1.36 +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service 1.37 ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in 1.38 + 1.39 + obex_plugindir = $(libdir)/obex/plugins 1.40 + 1.41 +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service 1.42 +deleted file mode 100644 1.43 +index a538088..0000000 1.44 +--- a/obexd/src/org.bluez.obex.service 1.45 ++++ /dev/null 1.46 +@@ -1,4 +0,0 @@ 1.47 +-[D-BUS Service] 1.48 +-Name=org.bluez.obex 1.49 +-Exec=/bin/false 1.50 +-SystemdService=dbus-org.bluez.obex.service 1.51 +diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in 1.52 +new file mode 100644 1.53 +index 0000000..9c815f2 1.54 +--- /dev/null 1.55 ++++ b/obexd/src/org.bluez.obex.service.in 1.56 +@@ -0,0 +1,4 @@ 1.57 ++[D-BUS Service] 1.58 ++Name=org.bluez.obex 1.59 ++Exec=@libexecdir@/obexd 1.60 ++SystemdService=dbus-org.bluez.obex.service 1.61 +-- 1.62 +1.8.3.1 1.63 + 1.64 +