summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2019-12-23 07:50:01 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-23 11:15:25 +0100
commit0972ff85938dcde7f47822814f6d899480a1262f (patch)
tree8047bef22bca4172bdea7738536b98ec7ffb9db3
parentapp-admin/puppet: remove unused patches (diff)
downloadgentoo-0972ff85938dcde7f47822814f6d899480a1262f.tar.gz
gentoo-0972ff85938dcde7f47822814f6d899480a1262f.tar.bz2
gentoo-0972ff85938dcde7f47822814f6d899480a1262f.zip
net-wireless/bluez: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/14101 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch58
-rw-r--r--net-wireless/bluez/files/bluez-5.39-systemd-quote.patch38
-rw-r--r--net-wireless/bluez/files/bluez-plugdev.patch14
3 files changed, 0 insertions, 110 deletions
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
deleted file mode 100644
index dec93073e18..00000000000
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-+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
-
diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
deleted file mode 100644
index d23c877eef8..00000000000
--- a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 3 Apr 2016 14:30:02 -0400
-Subject: [PATCH] build: Quote systemd variable names
-
-If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is
-defined as a macro. Quote this name to prevent macro expansion.
-
-Bug: https://bugs.gentoo.org/527432
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1679a47..4664003 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then
- fi
- AC_MSG_RESULT([${path_systemunitdir}])
- fi
--AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}])
-+AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}])
-
- AC_ARG_WITH([systemduserunitdir],
- AC_HELP_STRING([--with-systemduserunitdir=DIR],
-@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then
- fi
- AC_MSG_RESULT([${path_userunitdir}])
- fi
--AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}])
-+AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}])
-
- AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
- [do not install configuration and data files]),
---
-2.8.0
-
diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch
deleted file mode 100644
index 726838a5132..00000000000
--- a/net-wireless/bluez/files/bluez-plugdev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf
---- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100
-+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200
-@@ -17,6 +17,10 @@
- <allow send_destination="org.bluez"/>
- </policy>
-
-+ <policy group="plugdev">
-+ <allow send_destination="org.bluez"/>
-+ </policy>
-+
- <policy context="default">
- <deny send_destination="org.bluez"/>
- </policy>