1 |
commit: 0972ff85938dcde7f47822814f6d899480a1262f |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Dec 23 06:50:01 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 23 10:15:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0972ff85 |
7 |
|
8 |
net-wireless/bluez: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/14101 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
...xd-without-systemd-in-the-user-session-r1.patch | 58 ---------------------- |
15 |
.../bluez/files/bluez-5.39-systemd-quote.patch | 38 -------------- |
16 |
net-wireless/bluez/files/bluez-plugdev.patch | 14 ------ |
17 |
3 files changed, 110 deletions(-) |
18 |
|
19 |
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 |
20 |
deleted file mode 100644 |
21 |
index dec93073e18..00000000000 |
22 |
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch |
23 |
+++ /dev/null |
24 |
@@ -1,58 +0,0 @@ |
25 |
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 |
26 |
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@××××××××××××.org> |
27 |
-Date: Sat, 12 Oct 2013 17:45:25 +0200 |
28 |
-Subject: [PATCH] Allow using obexd without systemd in the user session |
29 |
- |
30 |
-Not all sessions run systemd --user (actually, the majority |
31 |
-doesn't), so the dbus daemon must be able to spawn obexd |
32 |
-directly, and to do so it needs the full path of the daemon. |
33 |
---- |
34 |
- Makefile.obexd | 4 ++-- |
35 |
- obexd/src/org.bluez.obex.service | 4 ---- |
36 |
- obexd/src/org.bluez.obex.service.in | 4 ++++ |
37 |
- 3 files changed, 6 insertions(+), 6 deletions(-) |
38 |
- delete mode 100644 obexd/src/org.bluez.obex.service |
39 |
- create mode 100644 obexd/src/org.bluez.obex.service.in |
40 |
- |
41 |
-diff --git a/Makefile.obexd b/Makefile.obexd |
42 |
-index 3760867..142e7c3 100644 |
43 |
---- a/Makefile.obexd |
44 |
-+++ b/Makefile.obexd |
45 |
-@@ -2,12 +2,12 @@ |
46 |
- if SYSTEMD |
47 |
- systemduserunitdir = $(SYSTEMD_USERUNITDIR) |
48 |
- systemduserunit_DATA = obexd/src/obex.service |
49 |
-+endif |
50 |
- |
51 |
- dbussessionbusdir = $(DBUS_SESSIONBUSDIR) |
52 |
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service |
53 |
--endif |
54 |
- |
55 |
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service |
56 |
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in |
57 |
- |
58 |
- obex_plugindir = $(libdir)/obex/plugins |
59 |
- |
60 |
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service |
61 |
-deleted file mode 100644 |
62 |
-index a538088..0000000 |
63 |
---- a/obexd/src/org.bluez.obex.service |
64 |
-+++ /dev/null |
65 |
-@@ -1,4 +0,0 @@ |
66 |
--[D-BUS Service] |
67 |
--Name=org.bluez.obex |
68 |
--Exec=/bin/false |
69 |
--SystemdService=dbus-org.bluez.obex.service |
70 |
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in |
71 |
-new file mode 100644 |
72 |
-index 0000000..9c815f2 |
73 |
---- /dev/null |
74 |
-+++ b/obexd/src/org.bluez.obex.service.in |
75 |
-@@ -0,0 +1,4 @@ |
76 |
-+[D-BUS Service] |
77 |
-+Name=org.bluez.obex |
78 |
-+Exec=@libexecdir@/obexd |
79 |
-+SystemdService=dbus-org.bluez.obex.service |
80 |
--- |
81 |
-1.8.3.1 |
82 |
- |
83 |
|
84 |
diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch |
85 |
deleted file mode 100644 |
86 |
index d23c877eef8..00000000000 |
87 |
--- a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch |
88 |
+++ /dev/null |
89 |
@@ -1,38 +0,0 @@ |
90 |
-From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001 |
91 |
-From: Mike Gilbert <floppym@g.o> |
92 |
-Date: Sun, 3 Apr 2016 14:30:02 -0400 |
93 |
-Subject: [PATCH] build: Quote systemd variable names |
94 |
- |
95 |
-If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is |
96 |
-defined as a macro. Quote this name to prevent macro expansion. |
97 |
- |
98 |
-Bug: https://bugs.gentoo.org/527432 |
99 |
---- |
100 |
- configure.ac | 4 ++-- |
101 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
102 |
- |
103 |
-diff --git a/configure.ac b/configure.ac |
104 |
-index 1679a47..4664003 100644 |
105 |
---- a/configure.ac |
106 |
-+++ b/configure.ac |
107 |
-@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then |
108 |
- fi |
109 |
- AC_MSG_RESULT([${path_systemunitdir}]) |
110 |
- fi |
111 |
--AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}]) |
112 |
-+AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}]) |
113 |
- |
114 |
- AC_ARG_WITH([systemduserunitdir], |
115 |
- AC_HELP_STRING([--with-systemduserunitdir=DIR], |
116 |
-@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then |
117 |
- fi |
118 |
- AC_MSG_RESULT([${path_userunitdir}]) |
119 |
- fi |
120 |
--AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}]) |
121 |
-+AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}]) |
122 |
- |
123 |
- AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], |
124 |
- [do not install configuration and data files]), |
125 |
--- |
126 |
-2.8.0 |
127 |
- |
128 |
|
129 |
diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch |
130 |
deleted file mode 100644 |
131 |
index 726838a5132..00000000000 |
132 |
--- a/net-wireless/bluez/files/bluez-plugdev.patch |
133 |
+++ /dev/null |
134 |
@@ -1,14 +0,0 @@ |
135 |
-diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf |
136 |
---- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100 |
137 |
-+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200 |
138 |
-@@ -17,6 +17,10 @@ |
139 |
- <allow send_destination="org.bluez"/> |
140 |
- </policy> |
141 |
- |
142 |
-+ <policy group="plugdev"> |
143 |
-+ <allow send_destination="org.bluez"/> |
144 |
-+ </policy> |
145 |
-+ |
146 |
- <policy context="default"> |
147 |
- <deny send_destination="org.bluez"/> |
148 |
- </policy> |