1 |
commit: e4bccfefa9e19ea37c7999197e4042adef1bbf02 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 29 13:47:36 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 29 13:47:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4bccfef |
7 |
|
8 |
net-wireless/bluez: Update patch |
9 |
|
10 |
Thanks-to: Joakim Tjernlund |
11 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=695316 |
12 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
13 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
14 |
|
15 |
net-wireless/bluez/bluez-5.51.ebuild | 2 +- |
16 |
...xd-without-systemd-in-the-user-session-r1.patch | 58 ++++++++++++++++++++++ |
17 |
2 files changed, 59 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/net-wireless/bluez/bluez-5.51.ebuild b/net-wireless/bluez/bluez-5.51.ebuild |
20 |
index d0143d9e574..3c34a631d36 100644 |
21 |
--- a/net-wireless/bluez/bluez-5.51.ebuild |
22 |
+++ b/net-wireless/bluez/bluez-5.51.ebuild |
23 |
@@ -93,7 +93,7 @@ src_prepare() { |
24 |
|
25 |
# http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
26 |
if ! use user-session || ! use systemd; then |
27 |
- eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch |
28 |
+ eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch |
29 |
fi |
30 |
|
31 |
if use cups; then |
32 |
|
33 |
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..dec93073e18 |
36 |
--- /dev/null |
37 |
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch |
38 |
@@ -0,0 +1,58 @@ |
39 |
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 |
40 |
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@××××××××××××.org> |
41 |
+Date: Sat, 12 Oct 2013 17:45:25 +0200 |
42 |
+Subject: [PATCH] Allow using obexd without systemd in the user session |
43 |
+ |
44 |
+Not all sessions run systemd --user (actually, the majority |
45 |
+doesn't), so the dbus daemon must be able to spawn obexd |
46 |
+directly, and to do so it needs the full path of the daemon. |
47 |
+--- |
48 |
+ Makefile.obexd | 4 ++-- |
49 |
+ obexd/src/org.bluez.obex.service | 4 ---- |
50 |
+ obexd/src/org.bluez.obex.service.in | 4 ++++ |
51 |
+ 3 files changed, 6 insertions(+), 6 deletions(-) |
52 |
+ delete mode 100644 obexd/src/org.bluez.obex.service |
53 |
+ create mode 100644 obexd/src/org.bluez.obex.service.in |
54 |
+ |
55 |
+diff --git a/Makefile.obexd b/Makefile.obexd |
56 |
+index 3760867..142e7c3 100644 |
57 |
+--- a/Makefile.obexd |
58 |
++++ b/Makefile.obexd |
59 |
+@@ -2,12 +2,12 @@ |
60 |
+ if SYSTEMD |
61 |
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR) |
62 |
+ systemduserunit_DATA = obexd/src/obex.service |
63 |
++endif |
64 |
+ |
65 |
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR) |
66 |
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service |
67 |
+-endif |
68 |
+ |
69 |
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service |
70 |
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in |
71 |
+ |
72 |
+ obex_plugindir = $(libdir)/obex/plugins |
73 |
+ |
74 |
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service |
75 |
+deleted file mode 100644 |
76 |
+index a538088..0000000 |
77 |
+--- a/obexd/src/org.bluez.obex.service |
78 |
++++ /dev/null |
79 |
+@@ -1,4 +0,0 @@ |
80 |
+-[D-BUS Service] |
81 |
+-Name=org.bluez.obex |
82 |
+-Exec=/bin/false |
83 |
+-SystemdService=dbus-org.bluez.obex.service |
84 |
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in |
85 |
+new file mode 100644 |
86 |
+index 0000000..9c815f2 |
87 |
+--- /dev/null |
88 |
++++ b/obexd/src/org.bluez.obex.service.in |
89 |
+@@ -0,0 +1,4 @@ |
90 |
++[D-BUS Service] |
91 |
++Name=org.bluez.obex |
92 |
++Exec=@libexecdir@/obexd |
93 |
++SystemdService=dbus-org.bluez.obex.service |
94 |
+-- |
95 |
+1.8.3.1 |
96 |
+ |