Djam/bluez
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/bluez.git synced 2025-02-22 22:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert to 5.49

Browse source
This commit is contained in:
Victor Ryzhikh 2018-07-11 12:03:47 +03:00
parent 4717c9d710
commit 4b6d432aa7
1 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch
View file

@ -1,7 +1,24 @@
diff -urN bluez-5.50/Makefile.obexd bluez-5.50-patched/Makefile.obexd
--- bluez-5.50/Makefile.obexd 2018-06-01 11:37:35.000000000 +0300
+++ bluez-5.50-patched/Makefile.obexd 2018-06-05 09:28:26.537699230 +0300
@@ -1,12 +1,12 @@
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
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -2,12 +2,12 @@
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
systemduserunit_DATA = obexd/src/obex.service
@ -14,21 +31,28 @@ diff -urN bluez-5.50/Makefile.obexd bluez-5.50-patched/Makefile.obexd
-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
if OBEX
obex_plugindir = $(libdir)/obex/plugins
diff -urN bluez-5.50/obexd/src/org.bluez.obex.service bluez-5.50-patched/obexd/src/org.bluez.obex.service
--- bluez-5.50/obexd/src/org.bluez.obex.service 2012-12-24 21:46:55.000000000 +0400
+++ bluez-5.50-patched/obexd/src/org.bluez.obex.service 1970-01-01 03:00:00.000000000 +0300
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 -urN bluez-5.50/obexd/src/org.bluez.obex.service.in bluez-5.50-patched/obexd/src/org.bluez.obex.service.in
--- bluez-5.50/obexd/src/org.bluez.obex.service.in 1970-01-01 03:00:00.000000000 +0300
+++ bluez-5.50-patched/obexd/src/org.bluez.obex.service.in 2018-06-05 09:30:29.454367592 +0300
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