gentoo resync : 10.11.2019

5 files changed, 3 insertions, 120 deletions

diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
index 1ea3e6f3e0c1..dcebaa007bc1 100644
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
@@ -20,11 +20,11 @@ index 3760867..142e7c3 100644
 +++ b/Makefile.obexd
 @@ -2,12 +2,12 @@
  if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
  systemduserunit_DATA = obexd/src/obex.service
 +endif
  
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
 -endif
  
@@ -51,7 +51,7 @@ index 0000000..9c815f2
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
++Exec=@pkglibexecdir@/obexd
 +SystemdService=dbus-org.bluez.obex.service
 -- 
 1.8.3.1
diff --git a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch b/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
deleted file mode 100644
index 2746e0cdd2cb..000000000000
--- a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 9 Dec 2013 18:04:56 +0100
-Subject: [PATCH 4/5] agent: Assert possible infinite loop
-
----
- src/agent.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/agent.c b/src/agent.c
-index bcba969..b292881 100644
---- a/src/agent.c
-+++ b/src/agent.c
-@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent)
- 	if (agent->ref > 0)
- 		return;
- 
-+	g_assert (agent->ref == 0);
-+
- 	if (agent->request) {
- 		DBusError err;
- 		agent_pincode_cb pincode_cb;
--- 
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch b/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch
deleted file mode 100644
index 61a8e6a37424..000000000000
--- a/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nuar bluez-5.50/tools/btpclient.c bluez-5.50-fixed/tools/btpclient.c
---- bluez-5.50/tools/btpclient.c	2018-03-10 17:37:07.000000000 +0200
-+++ bluez-5.50-fixed/tools/btpclient.c	2018-11-18 09:54:38.916794492 +0200
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <getopt.h>
-+#include <signal.h>
- 
- #include <ell/ell.h>
diff --git a/net-wireless/bluez/files/bluez-5.50-sink-connect.patch b/net-wireless/bluez/files/bluez-5.50-sink-connect.patch
deleted file mode 100644
index 2093b69a6554..000000000000
--- a/net-wireless/bluez/files/bluez-5.50-sink-connect.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 477ecca127c529611adbc53f08039cefaf86305d Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Tue, 26 Jun 2018 13:37:33 +0300
-Subject: policy: Add logic to connect a Sink
-
-If HFP/HSP HS connects and the device also supports a Sink connect it
-as well since some devices (e.g. Sony MW600) may not connect it
-automatically.
----
- plugins/policy.c | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/plugins/policy.c b/plugins/policy.c
-index 1f5a506a2..de51e58b9 100644
---- a/plugins/policy.c
-+++ b/plugins/policy.c
-@@ -297,6 +297,42 @@ static void sink_cb(struct btd_service *service, btd_service_state_t old_state,
- 	}
- }
- 
-+static void hs_cb(struct btd_service *service, btd_service_state_t old_state,
-+						btd_service_state_t new_state)
-+{
-+	struct btd_device *dev = btd_service_get_device(service);
-+	struct policy_data *data;
-+	struct btd_service *sink;
-+
-+	/* If the device supports Sink set a timer to connect it as well */
-+	sink = btd_device_get_service(dev, A2DP_SINK_UUID);
-+	if (sink == NULL)
-+		return;
-+
-+	data = policy_get_data(dev);
-+
-+	switch (new_state) {
-+	case BTD_SERVICE_STATE_UNAVAILABLE:
-+		break;
-+	case BTD_SERVICE_STATE_DISCONNECTED:
-+		break;
-+	case BTD_SERVICE_STATE_CONNECTING:
-+		break;
-+	case BTD_SERVICE_STATE_CONNECTED:
-+		/* Check if service initiate the connection then proceed
-+		 * immediately otherwise set timer
-+		 */
-+		if (old_state == BTD_SERVICE_STATE_CONNECTING)
-+			policy_connect(data, sink);
-+		else if (btd_service_get_state(sink) !=
-+						BTD_SERVICE_STATE_CONNECTED)
-+			policy_set_sink_timer(data);
-+		break;
-+	case BTD_SERVICE_STATE_DISCONNECTING:
-+		break;
-+	}
-+}
-+
- static gboolean policy_connect_tg(gpointer user_data)
- {
- 	struct policy_data *data = user_data;
-@@ -615,6 +651,9 @@ static void service_cb(struct btd_service *service,
- 		controller_cb(service, old_state, new_state);
- 	else if (g_str_equal(profile->remote_uuid, AVRCP_TARGET_UUID))
- 		target_cb(service, old_state, new_state);
-+	else if (g_str_equal(profile->remote_uuid, HFP_HS_UUID) ||
-+			g_str_equal(profile->remote_uuid, HSP_HS_UUID))
-+		hs_cb(service, old_state, new_state);
- 
- 	/*
- 	 * Return if the reconnection feature is not enabled (all
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/net-wireless/bluez/files/bluez-udevadm-path.patch b/net-wireless/bluez/files/bluez-udevadm-path.patch
deleted file mode 100644
index f9bbac5b9879..000000000000
--- a/net-wireless/bluez/files/bluez-udevadm-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/hid2hci.rules
-+++ b/tools/hid2hci.rules
-@@ -20,6 +20,7 @@
- # Unfortunately the only event seen is the BT device disappearing, so the mouse
- # device needs to be chased down on the USB bus.
- ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
-+  ENV{REMOVE_CMD}="/usr/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"     \
-   ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
- 
- # CSR devices