bluez5 (refresh patches to apply on 5.63 version)

:Release Notes:

:Detailed Notes:
Fixes:
ERROR: bluez5-5.63-r0 do_patch: Applying patch '0007-recievePassThrough-commad-support-required-for-webos.patch' on target directory '/OE/lge/build/webos/kirkstone/BUILD/work/qemux86_64-webos-linux/bluez5/5.63-r0/bluez-5.63'
CmdError('quilt --quiltrc /OE/lge/build/webos/kirkstone/BUILD/work/qemux86_64-webos-linux/bluez5/5.63-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0007-recievePassThrough-commad-support-required-for-webos.patch
patching file profiles/audio/avctp.c
patching file src/device.c
Hunk #1 succeeded at 172 (offset 1 line).
Hunk #2 FAILED at 279.
Hunk #3 succeeded at 1388 (offset 77 lines).
Hunk #4 succeeded at 1418 (offset 77 lines).
Hunk #5 succeeded at 1432 (offset 77 lines).
Hunk #6 succeeded at 2045 (offset 105 lines).
Hunk #7 succeeded at 3263 (offset 119 lines).
Hunk #8 succeeded at 4501 (offset 165 lines).
1 out of 8 hunks FAILED -- rejects in file src/device.c
patching file src/device.h
Hunk #1 succeeded at 180 (offset 1 line).
Patch 0007-recievePassThrough-commad-support-required-for-webos.patch does not apply (enforce with -f)

stderr: ')
ERROR: Logfile of failure stored in: /OE/lge/build/webos/kirkstone/BUILD/work/qemux86_64-webos-linux/bluez5/5.63-r0/temp/log.do_patch.405525

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRO-12999] CCC: Upgrade to Yocto 4.0 Kirkstone
[WRN-9820] Create GPVB with Yocto 4.0 Kirkstone

Change-Id: Ib353e654e5c18bbbe2494526e53784a6e2bb2eaf

meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch

@@ -1,4 +1,4 @@
-From 817768c80b76911db5a18a50c2c396f75c092919 Mon Sep 17 00:00:00 2001
+From f19215c99e454c28539a78b8635e3efa62635f46 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <[email protected]>
 Date: Wed, 11 Apr 2018 11:03:20 +0530
 Subject: [PATCH] Fix advertise time out when default is set to zero
@@ -25,7 +25,7 @@ Change-Id: I60cb0c22991efa61a800b1483e232e42beff2da2
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/src/advertising.c b/src/advertising.c
-index 41b818650..8cfb3d6e1 100644
+index 2110f17c9..c9fc1927d 100644
 --- a/src/advertising.c
 +++ b/src/advertising.c
 @@ -525,13 +525,18 @@ static bool parse_local_name(DBusMessageIter *iter,

meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch

@@ -1,4 +1,4 @@
-From 428a1134186ed11fcbc750463dc16729f76baaa3 Mon Sep 17 00:00:00 2001
+From c146a47611ffdec2995214160c9003880cc26f2c Mon Sep 17 00:00:00 2001
 From: Vibhanshu Dhote <[email protected]>
 Date: Thu, 17 May 2018 18:15:48 +0530
 Subject: [PATCH] Send disconnect signal on remote device disconnect

meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch

@@ -1,4 +1,4 @@
-From 0b86a1b453aea305cff94c60014713e9364c6b61 Mon Sep 17 00:00:00 2001
+From 2ec086a629e86c1c02b00c656a4ce06876048715 Mon Sep 17 00:00:00 2001
 From: "vijaya.sundaram" <[email protected]>
 Date: Fri, 1 Jun 2018 11:43:15 +0530
 Subject: [PATCH] Fetching device type like BLE, BREDR from bluez
@@ -24,18 +24,18 @@ Upstream-Status : Pending
  1 file changed, 17 insertions(+)
 
 diff --git a/src/device.c b/src/device.c
-index ac83cdc9c..3a61bfdb2 100644
+index 982b7979e..d04a5abd6 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -206,6 +206,7 @@ struct btd_device {
+@@ -207,6 +207,7 @@ struct btd_device {
  	char		name[MAX_NAME_LENGTH + 1];
  	char		*alias;
  	uint32_t	class;
 +	uint32_t	devicetype;
  	uint16_t	vendor_src;
  	uint16_t	vendor;
  	uint16_t	product;
-@@ -879,6 +880,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
+@@ -956,6 +957,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
  	return TRUE;
  }
 
@@ -57,7 +57,7 @@ index ac83cdc9c..3a61bfdb2 100644
  static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
  							uint16_t *appearance)
  {
-@@ -2993,6 +3009,7 @@ static const GDBusMethodTable device_methods[] = {
+@@ -3112,6 +3128,7 @@ static const GDBusMethodTable device_methods[] = {
  static const GDBusPropertyTable device_properties[] = {
  	{ "Address", "s", dev_property_get_address },
  	{ "AddressType", "s", property_get_address_type },

meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch

@@ -1,4 +1,4 @@
-From bb55717f0bf53a57b797b65be0c0759ecd4c1420 Mon Sep 17 00:00:00 2001
+From 0d4f87e50e55e2d258a6042add562e07a1d0dac1 Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <[email protected]>
 Date: Sun, 22 Jul 2018 18:59:45 +0530
 Subject: [PATCH] Fix Gatt connect when device address type is BDADDR_LE_PUBLIC
@@ -29,10 +29,10 @@ Upstream-Status: Pending
  1 file changed, 28 insertions(+)
 
 diff --git a/src/device.c b/src/device.c
-index 3a61bfdb2..fa1aba8e9 100644
+index d04a5abd6..d997fb919 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -2230,6 +2230,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
+@@ -2335,6 +2335,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
  	return connect_profiles(dev, bdaddr_type, msg, NULL);
  }
 
@@ -66,7 +66,7 @@ index 3a61bfdb2..fa1aba8e9 100644
  static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
  							void *user_data)
  {
-@@ -2997,6 +3024,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
+@@ -3116,6 +3143,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
  static const GDBusMethodTable device_methods[] = {
  	{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
  	{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },

meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch

@@ -1,4 +1,4 @@
-From 974bdad458d5550211f0a8e2c41913ed0952c5d1 Mon Sep 17 00:00:00 2001
+From 1cc80b9b33719cf6444cf2c3383b39c38ae9033a Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <[email protected]>
 Date: Thu, 15 Nov 2018 11:08:44 +0530
 Subject: [PATCH] Use system bus instead of session for obexd
@@ -113,10 +113,10 @@ index 92faf4434..c1147897c 100644
  		return -EIO;
 
 diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
-index b2232ea09..b5a76c415 100644
+index f5a9d9ae8..88f412aba 100644
 --- a/obexd/plugins/pcsuite.c
 +++ b/obexd/plugins/pcsuite.c
-@@ -320,7 +320,7 @@ static gboolean send_backup_dbus_message(const char *oper,
+@@ -322,7 +322,7 @@ static gboolean send_backup_dbus_message(const char *oper,
 
  	file_size = size ? *size : 0;
 

meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch

@@ -1,4 +1,4 @@
-From 0ccaebfda474786a4ff861ef7bf1d18e30ec45ce Mon Sep 17 00:00:00 2001
+From 4cc7c13f53976e26f1e1301756d46acd001c5f9c Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <[email protected]>
 Date: Tue, 22 Jan 2019 23:25:18 +0530
 Subject: [PATCH] Implementation to get connected profiles uuids
@@ -25,18 +25,18 @@ Change-Id: I72834cc9b4bdd8f086565dc9a2a41006f758ad39
  1 file changed, 49 insertions(+), 1 deletion(-)
 
 diff --git a/src/device.c b/src/device.c
-index fa1aba8e9..1448fd27b 100644
+index d997fb919..3c573f873 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -215,6 +215,7 @@ struct btd_device {
+@@ -216,6 +216,7 @@ struct btd_device {
  	char		*modalias;
  	struct btd_adapter	*adapter;
  	GSList		*uuids;
 +	GSList		*connected_uuids;
  	GSList		*primaries;		/* List of primary services */
  	GSList		*services;		/* List of btd_service */
  	GSList		*pending;		/* Pending services */
-@@ -911,6 +912,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
+@@ -988,6 +989,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
  	return FALSE;
  }
 
@@ -65,7 +65,7 @@ index fa1aba8e9..1448fd27b 100644
  static gboolean dev_property_exists_appearance(
  			const GDBusPropertyTable *property, void *data)
  {
-@@ -1757,8 +1780,14 @@ static void device_profile_connected(struct btd_device *dev,
+@@ -1862,8 +1885,14 @@ static void device_profile_connected(struct btd_device *dev,
 
  	DBG("%s %s (%d)", profile->name, strerror(-err), -err);
 
@@ -81,7 +81,7 @@ index fa1aba8e9..1448fd27b 100644
 
  	if (dev->pending == NULL)
  		goto done;
-@@ -2281,6 +2310,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
+@@ -2386,6 +2415,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
  static void device_profile_disconnected(struct btd_device *dev,
  					struct btd_profile *profile, int err)
  {
@@ -96,15 +96,15 @@ index fa1aba8e9..1448fd27b 100644
  	if (!dev->disconnect)
  		return;
 
-@@ -3053,6 +3090,7 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3172,6 +3209,7 @@ static const GDBusPropertyTable device_properties[] = {
  	{ "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi },
  	{ "Connected", "b", dev_property_get_connected },
  	{ "UUIDs", "as", dev_property_get_uuids },
 +	{ "ConnectedUUIDS", "as", dev_property_get_connected_uuids },
  	{ "Modalias", "s", dev_property_get_modalias, NULL,
  						dev_property_exists_modalias },
  	{ "Adapter", "o", dev_property_get_adapter },
-@@ -3137,7 +3175,17 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)
+@@ -3256,7 +3294,17 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)
  	if (!state->connected)
  		return;
 

meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch

@@ -1,4 +1,4 @@
-From ddd06f1247f3d73ecf7b89e88e95aab3af1280c0 Mon Sep 17 00:00:00 2001
+From 7aed385d23b3432fb1560eb6f35d4ad7677dfcae Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <[email protected]>
 Date: Sun, 13 Jan 2019 13:35:55 +0530
 Subject: [PATCH] recievePassThrough commad support required for webos
@@ -25,12 +25,12 @@ Upstream-Status: Inappropriate[webos specific]
 Change-Id: I9c07aa27f242247b5c3df85e0b3605d2ba055cad
 ---
  profiles/audio/avctp.c |  5 ++++
- src/device.c           | 56 +++++++++++++++++++++++++++++++++++++++++-
+ src/device.c           | 57 +++++++++++++++++++++++++++++++++++++++++-
  src/device.h           |  2 ++
- 3 files changed, 62 insertions(+), 1 deletion(-)
+ 3 files changed, 63 insertions(+), 1 deletion(-)
 
 diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
-index 72509edec..757796c45 100644
+index 64d1a8504..2964b736d 100644
 --- a/profiles/audio/avctp.c
 +++ b/profiles/audio/avctp.c
 @@ -405,6 +405,7 @@ static size_t handle_panel_passthrough(struct avctp *session,
@@ -56,10 +56,10 @@ index 72509edec..757796c45 100644
  		break;
  	}
 diff --git a/src/device.c b/src/device.c
-index 1448fd27b..2133561e2 100644
+index 3c573f873..5335f812e 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -171,6 +171,11 @@ enum {
+@@ -172,6 +172,11 @@ enum {
  	WAKE_FLAG_DISABLED,
  };
 
@@ -71,15 +71,16 @@ index 1448fd27b..2133561e2 100644
  struct btd_device {
  	int ref_count;
 
-@@ -274,6 +279,7 @@ struct btd_device {
-
- 	GIOChannel	*att_io;
+@@ -277,6 +282,8 @@ struct btd_device {
  	guint		store_id;
+
+ 	time_t		name_resolve_failed_time;
++
 +	struct key_code passththough_key;
  };
 
  static const uint16_t uuid_list[] = {
-@@ -1306,6 +1312,18 @@ dev_property_manufacturer_data_exist(const GDBusPropertyTable *property,
+@@ -1383,6 +1390,18 @@ dev_property_manufacturer_data_exist(const GDBusPropertyTable *property,
  	return bt_ad_has_manufacturer_data(device->ad, NULL);
  }
 
@@ -98,7 +99,7 @@ index 1448fd27b..2133561e2 100644
  static void append_service_data(void *data, void *user_data)
  {
  	struct bt_ad_service_data *sd = data;
-@@ -1324,13 +1342,13 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
+@@ -1401,13 +1420,13 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
  	struct btd_device *device = data;
  	DBusMessageIter dict;
 
@@ -113,7 +114,7 @@ index 1448fd27b..2133561e2 100644
  	bt_ad_foreach_service_data(device->ad, append_service_data, &dict);
 
  	dbus_message_iter_close_container(iter, &dict);
-@@ -1338,6 +1356,28 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
+@@ -1415,6 +1434,28 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
  	return TRUE;
  }
 
@@ -142,7 +143,7 @@ index 1448fd27b..2133561e2 100644
  static gboolean
  dev_property_service_data_exist(const GDBusPropertyTable *property,
  								void *data)
-@@ -1901,6 +1941,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
+@@ -2006,6 +2047,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
  	g_slist_foreach(list, add_manufacturer_data, dev);
  }
 
@@ -158,7 +159,7 @@ index 1448fd27b..2133561e2 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3096,6 +3145,8 @@ static const GDBusPropertyTable device_properties[] = {
+@@ -3215,6 +3265,8 @@ static const GDBusPropertyTable device_properties[] = {
  	{ "Adapter", "o", dev_property_get_adapter },
  	{ "ManufacturerData", "a{qv}", dev_property_get_manufacturer_data,
  				NULL, dev_property_manufacturer_data_exist },
@@ -167,7 +168,7 @@ index 1448fd27b..2133561e2 100644
  	{ "ServiceData", "a{sv}", dev_property_get_service_data,
  				NULL, dev_property_service_data_exist },
  	{ "TxPower", "n", dev_property_get_tx_power, NULL,
-@@ -4286,6 +4337,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4451,6 +4503,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
  	device->adapter = adapter;
  	device->temporary = true;
 
@@ -178,10 +179,10 @@ index 1448fd27b..2133561e2 100644
  					gatt_service_removed, device, NULL);
 
 diff --git a/src/device.h b/src/device.h
-index 5f615cb4b..394470060 100644
+index 071576d6b..28597c674 100644
 --- a/src/device.h
 +++ b/src/device.h
-@@ -179,3 +179,5 @@ bool btd_device_all_services_allowed(struct btd_device *dev);
+@@ -180,3 +180,5 @@ bool btd_device_all_services_allowed(struct btd_device *dev);
  void btd_device_update_allowed_services(struct btd_device *dev);
  void btd_device_init(void);
  void btd_device_cleanup(void);

meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch

@@ -1,4 +1,4 @@
-From 810d7f8305919577f46d5ee7756deaecfea67b42 Mon Sep 17 00:00:00 2001
+From 266ac6629627ce32b4604261cddd9771710f48be Mon Sep 17 00:00:00 2001
 From: "sameer.mulla" <[email protected]>
 Date: Wed, 30 Jan 2019 15:17:11 +0530
 Subject: [PATCH] Added dbus signal for MediaPlayRequest
@@ -49,7 +49,7 @@ index 7c280203c..0339f4921 100644
  }
 
 diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index 521902ed8..5a74d9b00 100644
+index edefedc90..332f50a63 100644
 --- a/profiles/audio/media.c
 +++ b/profiles/audio/media.c
 @@ -1222,7 +1222,7 @@ static uint32_t media_player_get_position(void *user_data)
@@ -62,10 +62,10 @@ index 521902ed8..5a74d9b00 100644
 
  static uint32_t media_player_get_duration(void *user_data)
 diff --git a/src/device.c b/src/device.c
-index 2133561e2..c186d43ec 100644
+index 5335f812e..9a69770ec 100644
 --- a/src/device.c
 +++ b/src/device.c
-@@ -1950,6 +1950,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
+@@ -2056,6 +2056,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
  					DEVICE_INTERFACE, "KeyCode");
  }
 
@@ -88,7 +88,7 @@ index 2133561e2..c186d43ec 100644
  static void add_service_data(void *data, void *user_data)
  {
  	struct eir_sd *sd = data;
-@@ -3107,6 +3123,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
+@@ -3227,6 +3243,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
  	return dbus_message_new_method_return(msg);
  }
 
@@ -101,7 +101,7 @@ index 2133561e2..c186d43ec 100644
  static const GDBusMethodTable device_methods[] = {
  	{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
  	{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
-@@ -4326,7 +4348,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
+@@ -4492,7 +4514,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
 
  	if (g_dbus_register_interface(dbus_conn,
  					device->path, DEVICE_INTERFACE,
@@ -111,10 +111,10 @@ index 2133561e2..c186d43ec 100644
  					device_free) == FALSE) {
  		error("Unable to register device interface for %s", address);
 diff --git a/src/device.h b/src/device.h
-index 394470060..7fd36c6f0 100644
+index 28597c674..4ecc2dce4 100644
 --- a/src/device.h
 +++ b/src/device.h
-@@ -181,3 +181,6 @@ void btd_device_init(void);
+@@ -182,3 +182,6 @@ void btd_device_init(void);
  void btd_device_cleanup(void);
 
  void recieve_passThrough_commands(struct btd_device *dev, const char* code, const char* state);