Fri Nov 27 06:21:11 UTC 202020201127062111

Moved a few dependencies from vtown into the main tree, updated much of the
GNOME stack, and Xfce 4.14 appears in vtown! Thanks much to Robby Workman.
Hope everyone had a good day. Enjoy! :-)
a/upower-0.99.11-x86_64-1.txz:  Upgraded.
d/sassc-3.6.1-x86_64-1.txz:  Added.
d/vala-0.50.2-x86_64-1.txz:  Upgraded.
l/at-spi2-atk-2.38.0-x86_64-1.txz:  Upgraded.
l/at-spi2-core-2.38.0-x86_64-1.txz:  Upgraded.
l/brotli-1.0.9-x86_64-3.txz:  Rebuilt.
  Get rid of unrecognized -R in the pkg-config files.
l/dconf-0.38.0-x86_64-1.txz:  Upgraded.
l/dconf-editor-3.38.2-x86_64-1.txz:  Upgraded.
l/gcr-3.38.0-x86_64-1.txz:  Upgraded.
l/gdk-pixbuf2-2.42.0-x86_64-1.txz:  Upgraded.
l/gdk-pixbuf2-xlib-2.40.2-x86_64-1.txz:  Added.
l/gjs-1.66.1-x86_64-1.txz:  Added.
l/glade-3.38.2-x86_64-1.txz:  Added.
l/glib-networking-2.66.0-x86_64-1.txz:  Upgraded.
l/glib2-2.66.3-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.66.1-x86_64-1.txz:  Upgraded.
l/gtksourceview3-3.24.11-x86_64-1.txz:  Added.
l/gvfs-1.46.1-x86_64-1.txz:  Upgraded.
l/json-glib-1.6.0-x86_64-1.txz:  Upgraded.
l/librsvg-2.50.2-x86_64-1.txz:  Upgraded.
l/libsass-3.6.4-x86_64-1.txz:  Added.
l/libsoup-2.72.0-x86_64-1.txz:  Upgraded.
l/libwnck3-3.36.0-x86_64-1.txz:  Added.
l/pango-1.48.0-x86_64-1.txz:  Upgraded.
l/pygobject3-3.38.0-x86_64-1.txz:  Upgraded.
l/vte-0.62.1-x86_64-1.txz:  Upgraded.
testing/packages/vtown/deps/libsass-3.6.4-x86_64-1_vtown_1.txz:  Removed.
testing/packages/vtown/deps/sassc-3.6.1-x86_64-1_vtown_1.txz:  Removed.
testing/packages/vtown/deps/upower-0.99.11-x86_64-1_vtown_1.txz:  Removed.
testing/packages/vtown/xfce/Greybird-3.22.12-noarch-1_vtown_1.txz:  Added.
testing/packages/vtown/xfce/elementary-xfce-0.15.1-x86_64-1_vtown_1.txz:  Added.
testing/packages/vtown/xfce/exo-0.12.11-x86_64-2_vtown_1.txz:  Rebuilt.
testing/packages/vtown/xfce/garcon-0.6.4-x86_64-2_vtown_1.txz:  Rebuilt.
testing/packages/vtown/xfce/libxfce4ui-4.14.1-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/libxfce4util-4.14.0-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/mousepad-0.4.2-x86_64-1_vtown_1.txz:  Added.
testing/packages/vtown/xfce/thunar-1.8.16-x86_64-2_vtown_1.txz:  Rebuilt.
testing/packages/vtown/xfce/thunar-volman-0.9.5-x86_64-2_vtown_1.txz:  Rebuilt.
testing/packages/vtown/xfce/tumbler-0.2.9-x86_64-2_vtown_1.txz:  Rebuilt.
testing/packages/vtown/xfce/xfce4-appfinder-4.14.0-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-clipman-plugin-1.6.1-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-dev-tools-4.14.0-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-notifyd-0.6.2-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-panel-4.14.4-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-panel-profiles-1.0.10-x86_64-1_vtown_1.txz:  Added.
testing/packages/vtown/xfce/xfce4-power-manager-1.6.6-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-pulseaudio-plugin-0.4.3-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-screensaver-0.1.11-x86_64-1_vtown_1.txz:  Added.
testing/packages/vtown/xfce/xfce4-screenshooter-1.9.7-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-session-4.14.2-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-settings-4.14.3-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-systemload-plugin-1.2.3-x86_64-2_vtown_1.txz:  Rebuilt.
testing/packages/vtown/xfce/xfce4-taskmanager-1.2.3-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-terminal-0.8.9.2-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-weather-plugin-0.10.2-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfce4-whiskermenu-plugin-2.4.6-x86_64-1_vtown_1.txz:  Added.
testing/packages/vtown/xfce/xfconf-4.14.4-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfdesktop-4.14.3-x86_64-1_vtown_1.txz:  Upgraded.
testing/packages/vtown/xfce/xfwm4-4.14.6-x86_64-1_vtown_1.txz:  Upgraded.

16 files changed, 367 insertions, 551 deletions

diff --git a/source/a/upower/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch b/source/a/upower/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch
new file mode 100644
index 00000000..0a45dcf1
--- /dev/null
+++ b/source/a/upower/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch
@@ -0,0 +1,51 @@
+From 8e6cb06ff68a283b9857d4d0e831d93c42521534 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 17 Oct 2019 16:36:58 +0200
+Subject: [PATCH 2/7] linux: Fix memory leak in Bluez backend
+
+g_dbus_proxy_get_cached_property() returns transfer full GVariants.
+---
+ src/linux/up-device-bluez.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/linux/up-device-bluez.c b/src/linux/up-device-bluez.c
+index cd89529..5e595a9 100644
+--- a/src/linux/up-device-bluez.c
++++ b/src/linux/up-device-bluez.c
+@@ -71,9 +71,10 @@ up_device_bluez_coldplug (UpDevice *device)
+ 	GDBusProxy *proxy;
+ 	GError *error = NULL;
+ 	UpDeviceKind kind;
++	guint16 appearance;
+ 	const char *uuid;
+ 	const char *model;
+-	guint16 appearance;
++	GVariant *v;
+ 	guchar percentage;
+ 
+ 	/* Static device properties */
+@@ -93,10 +94,18 @@ up_device_bluez_coldplug (UpDevice *device)
+ 		return FALSE;
+ 	}
+ 
+-	appearance = g_variant_get_uint16 (g_dbus_proxy_get_cached_property (proxy, "Appearance"));
++	v = g_dbus_proxy_get_cached_property (proxy, "Appearance");
++	appearance = g_variant_get_uint16 (v);
+ 	kind = appearance_to_kind (appearance);
+-	uuid = g_variant_get_string (g_dbus_proxy_get_cached_property (proxy, "Address"), NULL);
+-	model = g_variant_get_string (g_dbus_proxy_get_cached_property (proxy, "Alias"), NULL);
++	g_variant_unref (v);
++
++	v = g_dbus_proxy_get_cached_property (proxy, "Address");
++	uuid = g_variant_get_string (v, NULL);
++	g_variant_unref (v);
++
++	v = g_dbus_proxy_get_cached_property (proxy, "Alias");
++	model = g_variant_get_string (v, NULL);
++	g_variant_unref (v);
+ 
+ 	/* hardcode some values */
+ 	g_object_set (device,
+-- 
+2.24.1
+
diff --git a/source/a/upower/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch b/source/a/upower/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch
new file mode 100644
index 00000000..156631a7
--- /dev/null
+++ b/source/a/upower/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch
@@ -0,0 +1,49 @@
+From ed0dfe4427770776a081877f77f1263491fbe1b6 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 17 Oct 2019 16:43:15 +0200
+Subject: [PATCH 3/7] linux: Fix warning when bluez Appearance property isn't
+ set
+
+The Appearance property might not be available, and would cause
+warnings like:
+upowerd[17733]: g_variant_get_type: assertion 'value != NULL' failed
+upowerd[17733]: g_variant_type_is_subtype_of: assertion 'g_variant_type_check (type)' failed
+upowerd[17733]: g_variant_get_uint16: assertion 'g_variant_is_of_type (value, G_VARIANT_TYPE_UINT16)' failed
+---
+ src/linux/up-device-bluez.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/linux/up-device-bluez.c b/src/linux/up-device-bluez.c
+index 5e595a9..2074746 100644
+--- a/src/linux/up-device-bluez.c
++++ b/src/linux/up-device-bluez.c
+@@ -71,7 +71,6 @@ up_device_bluez_coldplug (UpDevice *device)
+ 	GDBusProxy *proxy;
+ 	GError *error = NULL;
+ 	UpDeviceKind kind;
+-	guint16 appearance;
+ 	const char *uuid;
+ 	const char *model;
+ 	GVariant *v;
+@@ -95,9 +94,15 @@ up_device_bluez_coldplug (UpDevice *device)
+ 	}
+ 
+ 	v = g_dbus_proxy_get_cached_property (proxy, "Appearance");
+-	appearance = g_variant_get_uint16 (v);
+-	kind = appearance_to_kind (appearance);
+-	g_variant_unref (v);
++	if (v) {
++		guint16 appearance;
++
++		appearance = g_variant_get_uint16 (v);
++		kind = appearance_to_kind (appearance);
++		g_variant_unref (v);
++	} else {
++		kind = UP_DEVICE_KIND_UNKNOWN;
++	}
+ 
+ 	v = g_dbus_proxy_get_cached_property (proxy, "Address");
+ 	uuid = g_variant_get_string (v, NULL);
+-- 
+2.24.1
+
diff --git a/source/a/upower/patches/0006-lib-Add-Pen-device-type.patch b/source/a/upower/patches/0006-lib-Add-Pen-device-type.patch
new file mode 100644
index 00000000..f05b108d
--- /dev/null
+++ b/source/a/upower/patches/0006-lib-Add-Pen-device-type.patch
@@ -0,0 +1,89 @@
+From 72b85b8c1371f3396c293d9a2aa373b6a7551f63 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 24 Oct 2019 12:50:26 +0200
+Subject: [PATCH 6/7] lib: Add "Pen" device type
+
+So we can track the battery information for powered tablet pens, rather
+than labelling them as tablets.
+---
+ libupower-glib/up-device.c | 6 ++++--
+ libupower-glib/up-types.c  | 4 ++++
+ libupower-glib/up-types.h  | 1 +
+ src/linux/integration-test | 3 ++-
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c
+index e21274d..01f752f 100644
+--- a/libupower-glib/up-device.c
++++ b/libupower-glib/up-device.c
+@@ -313,7 +313,8 @@ up_device_to_text (UpDevice *device)
+ 	     kind == UP_DEVICE_KIND_BATTERY ||
+ 	     kind == UP_DEVICE_KIND_MOUSE ||
+ 	     kind == UP_DEVICE_KIND_KEYBOARD ||
+-	     kind == UP_DEVICE_KIND_GAMING_INPUT) &&
++	     kind == UP_DEVICE_KIND_GAMING_INPUT ||
++	     kind == UP_DEVICE_KIND_PEN) &&
+ 	    !is_display)
+ 		g_string_append_printf (string, "    rechargeable:        %s\n", up_device_bool_to_string (up_exported_device_get_is_rechargeable (priv->proxy_device)));
+ 	if (kind == UP_DEVICE_KIND_BATTERY ||
+@@ -367,7 +368,8 @@ up_device_to_text (UpDevice *device)
+ 	    kind == UP_DEVICE_KIND_COMPUTER ||
+ 	    kind == UP_DEVICE_KIND_MEDIA_PLAYER ||
+ 	    kind == UP_DEVICE_KIND_UPS ||
+-	    kind == UP_DEVICE_KIND_GAMING_INPUT) {
++	    kind == UP_DEVICE_KIND_GAMING_INPUT ||
++	    kind == UP_DEVICE_KIND_PEN) {
+ 		if (battery_level == UP_DEVICE_LEVEL_NONE)
+ 			g_string_append_printf (string, "    percentage:          %g%%\n", up_exported_device_get_percentage (priv->proxy_device));
+ 		else
+diff --git a/libupower-glib/up-types.c b/libupower-glib/up-types.c
+index 525cd02..7cf9573 100644
+--- a/libupower-glib/up-types.c
++++ b/libupower-glib/up-types.c
+@@ -71,6 +71,8 @@ up_device_kind_to_string (UpDeviceKind type_enum)
+ 		return "computer";
+ 	case UP_DEVICE_KIND_GAMING_INPUT:
+ 		return "gaming-input";
++	case UP_DEVICE_KIND_PEN:
++		return "pen";
+ 	default:
+ 		return "unknown";
+ 	}
+@@ -113,6 +115,8 @@ up_device_kind_from_string (const gchar *type)
+ 		return UP_DEVICE_KIND_TABLET;
+ 	if (g_str_equal (type, "gaming-input"))
+ 		return UP_DEVICE_KIND_GAMING_INPUT;
++	if (g_str_equal (type, "pen"))
++		return UP_DEVICE_KIND_PEN;
+ 	return UP_DEVICE_KIND_UNKNOWN;
+ }
+ 
+diff --git a/libupower-glib/up-types.h b/libupower-glib/up-types.h
+index 079bccd..379d46c 100644
+--- a/libupower-glib/up-types.h
++++ b/libupower-glib/up-types.h
+@@ -49,6 +49,7 @@ typedef enum {
+ 	UP_DEVICE_KIND_TABLET,
+ 	UP_DEVICE_KIND_COMPUTER,
+ 	UP_DEVICE_KIND_GAMING_INPUT,
++	UP_DEVICE_KIND_PEN,
+ 	UP_DEVICE_KIND_LAST
+ } UpDeviceKind;
+ 
+diff --git a/src/linux/integration-test b/src/linux/integration-test
+index 7098a67..e5c6c46 100755
+--- a/src/linux/integration-test
++++ b/src/linux/integration-test
+@@ -86,7 +86,8 @@ BATTERY_IFACE = 'org.bluez.Battery1'
+  UP_DEVICE_KIND_MEDIA_PLAYER,
+  UP_DEVICE_KIND_TABLET,
+  UP_DEVICE_KIND_COMPUTER,
+- UP_DEVICE_KIND_GAMING_INPUT) = (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12)
++ UP_DEVICE_KIND_GAMING_INPUT,
++ UP_DEVICE_KIND_PEN) = (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13)
+ 
+ class Tests(dbusmock.DBusTestCase):
+     @classmethod
+-- 
+2.24.1
+
diff --git a/source/a/upower/patches/0007-linux-Detect-Bluetooth-pens.patch b/source/a/upower/patches/0007-linux-Detect-Bluetooth-pens.patch
new file mode 100644
index 00000000..13624db0
--- /dev/null
+++ b/source/a/upower/patches/0007-linux-Detect-Bluetooth-pens.patch
@@ -0,0 +1,28 @@
+From 85cd95ae53499788a0df86af28876ec27074caa2 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 24 Oct 2019 12:52:33 +0200
+Subject: [PATCH 1/3] linux: Detect Bluetooth pens
+
+Numbers from:
+https://www.bluetooth.com/specifications/assigned-numbers/baseband/
+---
+ src/linux/up-device-bluez.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/linux/up-device-bluez.c b/src/linux/up-device-bluez.c
+index 2074746..8673d82 100644
+--- a/src/linux/up-device-bluez.c
++++ b/src/linux/up-device-bluez.c
+@@ -52,6 +52,9 @@ appearance_to_kind (guint16 appearance)
+                         return UP_DEVICE_KIND_GAMING_INPUT;
+                 case 0x05:
+                         return UP_DEVICE_KIND_TABLET;
++                case 0x0e:
++                case 0x0f:
++                        return UP_DEVICE_KIND_PEN;
+                 }
+                 break;
+         }
+-- 
+2.26.2
+
diff --git a/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch b/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch
new file mode 100644
index 00000000..f8fece70
--- /dev/null
+++ b/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch
@@ -0,0 +1,46 @@
+From e0b8354e9cf53a271e66a7ba44fd567daeac2416 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 5 May 2020 16:07:31 +0200
+Subject: [PATCH 2/3] linux: Identify keyboard/pointing device combos as
+ keyboards
+
+Rather than using the type of the first sibling device we find, which is
+usually the pointing device portion, make sure that keyboard/pointing
+device combo devices are identified as keyboards.
+---
+ src/linux/up-device-supply.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
+index d7e4423..9302119 100644
+--- a/src/linux/up-device-supply.c
++++ b/src/linux/up-device-supply.c
+@@ -888,7 +888,7 @@ up_device_supply_get_sibling_with_subsystem (GUdevDevice *device,
+ 	class[0] = subsystem;
+ 	client = g_udev_client_new (class);
+ 	devices = g_udev_client_query_by_subsystem (client, subsystem);
+-	for (l = devices; l != NULL && sibling == NULL; l = l->next) {
++	for (l = devices; l != NULL; l = l->next) {
+ 		GUdevDevice *d = l->data;
+ 		GUdevDevice *p;
+ 		const char *p_path;
+@@ -897,8 +897,14 @@ up_device_supply_get_sibling_with_subsystem (GUdevDevice *device,
+ 		if (!p)
+ 			continue;
+ 		p_path = g_udev_device_get_sysfs_path (p);
+-		if (g_strcmp0 (p_path, parent_path) == 0)
+-			sibling = g_object_ref (d);
++		if (g_strcmp0 (p_path, parent_path) == 0) {
++			if (sibling != NULL &&
++			    g_udev_device_get_property_as_boolean (d, "ID_INPUT_KEYBOARD")) {
++				g_clear_object (&sibling);
++			}
++			if (sibling == NULL)
++				sibling = g_object_ref (d);
++		}
+ 
+ 		g_object_unref (p);
+ 	}
+-- 
+2.26.2
+
diff --git a/source/a/upower/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch b/source/a/upower/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch
new file mode 100644
index 00000000..2426e044
--- /dev/null
+++ b/source/a/upower/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch
@@ -0,0 +1,76 @@
+From 97185bae75b16bea48d532aa5511417e485b1c06 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 17 Jun 2020 10:51:09 +0200
+Subject: [PATCH 1/4] linux: Add support for iPhone XR, XS models
+
+Modifying the udev serial to be acceptable as an hyphened UDID, as the
+usbmux stack expects.
+
+Closes: #114
+---
+ src/linux/up-device-idevice.c | 28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c
+index a808269..d2fa0a1 100644
+--- a/src/linux/up-device-idevice.c
++++ b/src/linux/up-device-idevice.c
+@@ -203,6 +203,28 @@ out:
+ 	return G_SOURCE_CONTINUE;
+ }
+ 
++static char *
++get_device_uuid (GUdevDevice *native)
++{
++	const char *uuid;
++	char *retval;
++
++	uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
++	if (uuid == NULL)
++		return NULL;
++
++	if (strlen (uuid) != 24)
++		return g_strdup (uuid);
++
++	/* new style UDID: add hyphen between first 8 and following 16 digits */
++	retval = g_malloc0 (24 + 1 + 1);
++	memcpy (&retval[0], &uuid[0], 8);
++	retval[8] = '-';
++	memcpy (&retval[9], &uuid[8], 16);
++
++	return retval;
++}
++
+ /**
+  * up_device_idevice_coldplug:
+  *
+@@ -213,7 +235,7 @@ up_device_idevice_coldplug (UpDevice *device)
+ {
+ 	UpDeviceIdevice *idevice = UP_DEVICE_IDEVICE (device);
+ 	GUdevDevice *native;
+-	const gchar *uuid;
++	char *uuid;
+ 	const gchar *model;
+ 	UpDeviceKind kind;
+ 
+@@ -223,7 +245,7 @@ up_device_idevice_coldplug (UpDevice *device)
+ 		return FALSE;
+ 
+ 	/* Get the UUID */
+-	uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
++	uuid = get_device_uuid (native);
+ 	if (uuid == NULL)
+ 		return FALSE;
+ 
+@@ -253,6 +275,8 @@ up_device_idevice_coldplug (UpDevice *device)
+ 	g_source_set_name_by_id (idevice->priv->start_id,
+ 				 "[upower] up_device_idevice_start_poll_cb (linux)");
+ 
++	g_free (uuid);
++
+ 	return TRUE;
+ }
+ 
+-- 
+2.27.0
+
diff --git a/source/a/upower/patches/0012-build-Use-a-newer-libplist-if-available.patch b/source/a/upower/patches/0012-build-Use-a-newer-libplist-if-available.patch
new file mode 100644
index 00000000..d7e24ecf
--- /dev/null
+++ b/source/a/upower/patches/0012-build-Use-a-newer-libplist-if-available.patch
@@ -0,0 +1,28 @@
+From 694207d3f08bdd2095f01eee09eb523363800825 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 16 Jun 2020 14:04:25 +0200
+Subject: [PATCH 2/4] build: Use a newer libplist if available
+
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a96b794..5f08d91 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,8 +202,10 @@ if test x$with_backend = xlinux; then
+ 	PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0])
+ 	AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]),
+ 		    with_idevice=$withval,with_idevice=yes)
++	LIBPLIST_DEP=libplist
++	PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0)
+ 	AS_IF([test "x$with_idevice" != "xno"],
+-	      [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 libplist >= 0.12, have_idevice=yes, have_idevice=no)],
++	      [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 $LIBPLIST_DEP, have_idevice=yes, have_idevice=no)],
+ 	      [have_idevice=no])
+ 	AS_IF([test "x$have_idevice" = "xyes"],
+ 	      [AC_DEFINE(HAVE_IDEVICE, 1, [Define to 1 if iDevice is going to be built])])
+-- 
+2.27.0
+
diff --git a/source/a/upower/patches/Fix-HID-rules-header-as-per-discussions.patch b/source/a/upower/patches/Fix-HID-rules-header-as-per-discussions.patch
deleted file mode 100644
index d6100394..00000000
--- a/source/a/upower/patches/Fix-HID-rules-header-as-per-discussions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ae9f8521c6f900255df1b6c7bc9f6adfd09abda5 Mon Sep 17 00:00:00 2001
-From: Arnaud Quette <arnaud.quette@free.fr>
-Date: Mon, 22 Jun 2015 15:11:15 +0200
-Subject: [PATCH 1/2] Fix HID rules header, as per discussions
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- rules/95-upower-hid.rules | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/rules/95-upower-hid.rules b/rules/95-upower-hid.rules
-index dcf4380..767e9bc 100644
---- a/rules/95-upower-hid.rules
-+++ b/rules/95-upower-hid.rules
-@@ -1,10 +1,16 @@
- ##############################################################################################################
- # Uninterruptible Power Supplies with USB HID interfaces
- #
--# to keep up to date, monitor: http://svn.debian.org/wsvn/nut/trunk/scripts/upower/95-upower-hid.rules
-+# This file was automatically generated by NUT:
-+# https://github.com/networkupstools/nut/
-+#
-+# To keep up to date, monitor upstream NUT
-+# https://github.com/networkupstools/nut/commits/master/scripts/upower/95-upower-hid.rules
-+# or checkout the NUT repository and call 'tools/nut-usbinfo.pl'
- 
--# only support USB, else ignore
-+# newer hiddev are part of the usbmisc class
- SUBSYSTEM=="usbmisc", GOTO="up_hid_chkdev"
-+# only support USB, else ignore
- SUBSYSTEM!="usb", GOTO="up_hid_end"
- 
- # if usbraw device, ignore
--- 
-2.6.4
-
diff --git a/source/a/upower/patches/Update-UPower-HID-rules-supported-devices-list.patch b/source/a/upower/patches/Update-UPower-HID-rules-supported-devices-list.patch
deleted file mode 100644
index 8ef4498c..00000000
--- a/source/a/upower/patches/Update-UPower-HID-rules-supported-devices-list.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From fc27cbd5cb098ccf6c70110fe1b894987328fc0d Mon Sep 17 00:00:00 2001
-From: Arnaud Quette <arnaud.quette@free.fr>
-Date: Mon, 8 Jun 2015 10:08:24 +0200
-Subject: [PATCH 2/2] Update UPower HID rules - supported devices list
-
-As per update on the NUT - Network UPS Tools project, this first patch
-adds some more supported devices to the rules file
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- rules/95-upower-hid.rules | 31 +++++++++++++++++++++++++++++--
- 1 file changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/rules/95-upower-hid.rules b/rules/95-upower-hid.rules
-index 767e9bc..e064ef7 100644
---- a/rules/95-upower-hid.rules
-+++ b/rules/95-upower-hid.rules
-@@ -23,21 +23,31 @@ ENV{DEVTYPE}=="usb_interface", GOTO="up_hid_end"
- ATTRS{idVendor}=="03f0", ENV{UPOWER_VENDOR}="Hewlett Packard"
- ATTRS{idVendor}=="0463", ENV{UPOWER_VENDOR}="Eaton"
- ATTRS{idVendor}=="047c", ENV{UPOWER_VENDOR}="Dell"
-+ATTRS{idVendor}=="04d8", ENV{UPOWER_VENDOR}="Minibox"
- ATTRS{idVendor}=="050d", ENV{UPOWER_VENDOR}="Belkin"
- ATTRS{idVendor}=="051d", ENV{UPOWER_VENDOR}="APC"
--ATTRS{idVendor}=="06da", ENV{UPOWER_VENDOR}="Liebert"
-+ATTRS{idVendor}=="0592", ENV{UPOWER_VENDOR}="Powerware"
-+ATTRS{idVendor}=="06da", ENV{UPOWER_VENDOR}="Phoenixtec Power Co., Ltd"
-+ATTRS{idVendor}=="075d", ENV{UPOWER_VENDOR}="iDowell"
- ATTRS{idVendor}=="0764", ENV{UPOWER_VENDOR}="Cyber Power Systems"
- ATTRS{idVendor}=="09ae", ENV{UPOWER_VENDOR}="TrippLite"
- ATTRS{idVendor}=="0d9f", ENV{UPOWER_VENDOR}="PowerCOM"
- ATTRS{idVendor}=="10af", ENV{UPOWER_VENDOR}="Liebert"
- 
- # Hewlett Packard
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="0001", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f06", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f08", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f09", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f0a", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe0", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe1", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe2", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe3", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe5", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe6", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe7", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe8", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
- # Eaton
- ATTRS{idVendor}=="0463", ATTRS{idProduct}=="0001", ENV{UPOWER_BATTERY_TYPE}="ups"
-@@ -46,6 +56,10 @@ ATTRS{idVendor}=="0463", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups
- # Dell
- ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
-+# Minibox
-+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d004", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d005", ENV{UPOWER_BATTERY_TYPE}="ups"
-+
- # Belkin
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551", ENV{UPOWER_BATTERY_TYPE}="ups"
-@@ -55,15 +69,23 @@ ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0900", ENV{UPOWER_BATTERY_TYPE}="ups
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0910", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0912", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0980", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0f51", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="1100", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
- # APC
-+ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0000", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0002", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0003", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
--# Liebert
-+# Powerware
-+ATTRS{idVendor}=="0592", ATTRS{idProduct}=="0004", ENV{UPOWER_BATTERY_TYPE}="ups"
-+
-+# Phoenixtec Power Co., Ltd
- ATTRS{idVendor}=="06da", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
-+# iDowell
-+ATTRS{idVendor}=="075d", ATTRS{idProduct}=="0300", ENV{UPOWER_BATTERY_TYPE}="ups"
-+
- # Cyber Power Systems
- ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0005", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0501", ENV{UPOWER_BATTERY_TYPE}="ups"
-@@ -92,6 +114,7 @@ ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3012", ENV{UPOWER_BATTERY_TYPE}="ups
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3013", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3014", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3015", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3016", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4001", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4002", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4003", ENV{UPOWER_BATTERY_TYPE}="ups"
-@@ -102,6 +125,8 @@ ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4007", ENV{UPOWER_BATTERY_TYPE}="ups
- ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4008", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
- # PowerCOM
-+ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="0001", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="0004", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a2", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a3", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a4", ENV{UPOWER_BATTERY_TYPE}="ups"
-@@ -110,5 +135,7 @@ ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a6", ENV{UPOWER_BATTERY_TYPE}="ups
- 
- # Liebert
- ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0001", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0004", ENV{UPOWER_BATTERY_TYPE}="ups"
-+ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0008", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
- LABEL="up_hid_end"
--- 
-2.6.4
-
diff --git a/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch b/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch
deleted file mode 100644
index bb97ca78..00000000
--- a/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Tue, 22 Oct 2013 10:02:51 +0200
-Subject: [PATCH 2/3] linux: Clamp percentage for overfull batteries
-
-Some batteries report energy > energy_full and a percentage ("capacity"
-attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well
-as to avoid setting an out-of-range property which would then become 0%.
-
-https://launchpad.net/bugs/1240673
----
- src/linux/integration-test   | 33 +++++++++++++++++++++++++++++++++
- src/linux/up-device-supply.c |  4 ++++
- 2 files changed, 37 insertions(+)
-
-diff --git a/src/linux/integration-test b/src/linux/integration-test
-index 8489bf3..4be1922 100755
---- a/src/linux/integration-test
-+++ b/src/linux/integration-test
-@@ -442,6 +442,39 @@ class Tests(unittest.TestCase):
-         self.assertEqual(self.get_dbus_property('OnLowBattery'), False)
-         self.stop_daemon()
- 
-+    def test_battery_overfull(self):
-+        '''battery which reports a > 100% percentage for a full battery'''
-+
-+        self.testbed.add_device('power_supply', 'BAT0', None,
-+                                ['type', 'Battery',
-+                                 'present', '1',
-+                                 'status', 'Full',
-+                                 'current_now', '1000',
-+                                 'charge_now', '11000000',
-+                                 'charge_full', '10000000',
-+                                 'charge_full_design', '11000000',
-+                                 'capacity', '110',
-+                                 'voltage_now', '12000000'], [])
-+
-+        self.start_daemon()
-+        devs = self.proxy.EnumerateDevices()
-+        self.assertEqual(len(devs), 1)
-+        bat0_up = devs[0]
-+
-+        # should clamp percentage
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'),
-+                         UP_DEVICE_STATE_FULLY_CHARGED)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0)
-+        # should adjust EnergyFull to reality, not what the battery claims
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2)
-+        self.stop_daemon()
-+
-     def test_battery_temperature(self):
-         '''battery which reports temperature'''
- 
-diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
-index 8020277..b953d65 100644
---- a/src/linux/up-device-supply.c
-+++ b/src/linux/up-device-supply.c
-@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
- 	/* get a precise percentage */
-         if (sysfs_file_exists (native_path, "capacity")) {
- 		percentage = sysfs_get_double (native_path, "capacity");
-+		if (percentage < 0.0f)
-+			percentage = 0.0f;
-+		if (percentage > 100.0f)
-+			percentage = 100.0f;
-                 /* for devices which provide capacity, but not {energy,charge}_now */
-                 if (energy < 0.1f && energy_full > 0.0f)
-                     energy = energy_full * percentage / 100;
--- 
-2.6.4
-
diff --git a/source/a/upower/patches/linux-Detect-docked-docking-stations-correctly.patch b/source/a/upower/patches/linux-Detect-docked-docking-stations-correctly.patch
deleted file mode 100644
index bed83d8e..00000000
--- a/source/a/upower/patches/linux-Detect-docked-docking-stations-correctly.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a6e830cd652a086161f04b049c84283e0573881b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 15 Feb 2012 17:50:00 +0000
-Subject: [PATCH 3/3] linux: Detect docked docking stations correctly
-
-Instead of counting the number of graphics outputs, check
-all the devices the platform/dock_station subsystem that
-export a "dock_station" type.
-
-Based on patch by Armando Di Cianno <armando@goodship.net>
-
-https://bugs.freedesktop.org/show_bug.cgi?id=36818
----
- src/linux/up-dock.c | 38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/src/linux/up-dock.c b/src/linux/up-dock.c
-index f9a7c67..4fe904e 100644
---- a/src/linux/up-dock.c
-+++ b/src/linux/up-dock.c
-@@ -46,22 +46,23 @@ G_DEFINE_TYPE (UpDock, up_dock, G_TYPE_OBJECT)
-  * up_dock_device_check:
-  **/
- static gboolean
--up_dock_device_check (GUdevDevice *d)
-+up_dock_device_check (GUdevDevice *device)
- {
--	const gchar *status;
--	gboolean ret = FALSE;
--
--	/* Get the boolean state from the kernel -- note that ideally
--	 * the property value would be "1" or "true" but now it's
--	 * set in stone as ABI. Urgh. */
--	status = g_udev_device_get_sysfs_attr (d, "status");
--	if (status == NULL)
--		goto out;
--	ret = (g_strcmp0 (status, "connected") == 0);
--	g_debug ("graphics device %s is %s",
--		 g_udev_device_get_sysfs_path (d),
--		 ret ? "on" : "off");
--out:
-+	gint docked;
-+	gboolean ret;
-+
-+	/* Is it a docking station? */
-+	if (g_strcmp0 (g_udev_device_get_sysfs_attr (device, "dock_type"), "dock_station") != 0)
-+		return FALSE;
-+
-+	/* Get the boolean state from the kernel */
-+	if (g_udev_device_get_sysfs_attr (device, "docked") == NULL)
-+		return FALSE;
-+
-+	docked = g_udev_device_get_sysfs_attr_as_int (device, "docked");
-+	ret = (docked == 1);
-+	g_debug ("dock_station %s is %s", g_udev_device_get_sysfs_path (device), ret ? "docked" : "undocked");
-+
- 	return ret;
- }
- 
-@@ -76,10 +77,9 @@ up_dock_refresh (UpDock *dock)
- 	GUdevDevice *native;
- 	guint count = 0;
- 
--	/* the metric we're using here is that a machine is docked when
--	 * there is more than one active output */
-+	/* check to see if there are any docking stations, and if they are docked */
- 	devices = g_udev_client_query_by_subsystem (dock->priv->gudev_client,
--						    "drm");
-+						    "platform/dock_station");
- 	for (l = devices; l != NULL; l = l->next) {
- 		native = l->data;
- 		count += up_dock_device_check (native);
-@@ -163,7 +163,7 @@ up_dock_uevent_signal_handler_cb (GUdevClient *client, const gchar *action,
- static void
- up_dock_init (UpDock *dock)
- {
--	const gchar *subsystems[] = { "drm", NULL};
-+	const gchar *subsystems[] = { "platform/dock_station", NULL};
- 	dock->priv = UP_DOCK_GET_PRIVATE (dock);
- 	dock->priv->gudev_client = g_udev_client_new (subsystems);
- 	g_signal_connect (dock->priv->gudev_client, "uevent",
--- 
-2.6.4
-
diff --git a/source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch b/source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch
deleted file mode 100644
index 55de33b7..00000000
--- a/source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 6c706ff03365e462e1b076155428decbed0f55c6 Mon Sep 17 00:00:00 2001
-From: Marc Deslauriers <marc.deslauriers@ubuntu.com>
-Date: Mon, 4 May 2015 19:31:31 -0400
-Subject: [PATCH] linux: Properly detect bluetooth mice and keyboards that are
- HID devices
-
-https://bugs.freedesktop.org/show_bug.cgi?id=90222
----
- src/linux/integration-test   | 41 +++++++++++++++++++++++++++++++++++++
- src/linux/up-device-supply.c | 48 ++++++++++++++++++++++++++++----------------
- 2 files changed, 72 insertions(+), 17 deletions(-)
-
-diff --git a/src/linux/integration-test b/src/linux/integration-test
-index ad7152a..b83f80d 100755
---- a/src/linux/integration-test
-+++ b/src/linux/integration-test
-@@ -761,6 +761,47 @@ class Tests(unittest.TestCase):
-         self.assertEqual(self.get_dbus_dev_property(mb1_up, 'Percentage'), 30)
-         self.assertEqual(self.get_dbus_dev_property(mb1_up, 'PowerSupply'), False)
- 
-+    def test_bluetooth_hid_mouse(self):
-+        '''bluetooth HID mouse battery'''
-+
-+        self.testbed.add_device('hid',
-+                                'usb1/bluetooth/hci0/hci0:01',
-+                                None,
-+                                [], [])
-+
-+        self.testbed.add_device(
-+            'input',
-+            'usb1/bluetooth/hci0/hci0:01/input/input2/mouse3',
-+            None,
-+            [], ['DEVNAME', 'input/mouse3', 'ID_INPUT_MOUSE', '1'])
-+
-+        self.testbed.add_device(
-+            'power_supply',
-+            'usb1/bluetooth/hci0/hci0:01/1/power_supply/hid-00:11:22:33:44:55-battery',
-+            None,
-+            ['type', 'Battery',
-+             'scope', 'Device',
-+             'present', '1',
-+             'online', '1',
-+             'status', 'Discharging',
-+             'capacity', '30',
-+             'model_name', 'Fancy BT mouse'],
-+            [])
-+
-+        self.start_daemon()
-+        devs = self.proxy.EnumerateDevices()
-+        self.assertEqual(len(devs), 1)
-+        mousebat0_up = devs[0]
-+
-+        self.assertEqual(self.get_dbus_dev_property(mousebat0_up, 'Model'), 'Fancy BT mouse')
-+        self.assertEqual(self.get_dbus_dev_property(mousebat0_up, 'Percentage'), 30)
-+        self.assertEqual(self.get_dbus_dev_property(mousebat0_up, 'PowerSupply'), False)
-+        # 5 == mouse
-+        self.assertEqual(self.get_dbus_dev_property(mousebat0_up, 'Type'), 5)
-+        self.assertEqual(self.get_dbus_property('OnBattery'), False)
-+        self.assertEqual(self.get_dbus_display_property('WarningLevel'), UP_DEVICE_LEVEL_NONE)
-+        self.stop_daemon()
-+
-     def test_bluetooth_keyboard(self):
-         '''bluetooth keyboard battery'''
- 
-diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
-index 1f86382..b96080b 100644
---- a/src/linux/up-device-supply.c
-+++ b/src/linux/up-device-supply.c
-@@ -932,9 +932,12 @@ up_device_supply_coldplug (UpDevice *device)
- 	const gchar *scope;
- 	gchar *device_type = NULL;
- 	gchar *input_path = NULL;
-+	gchar *subdir = NULL;
- 	GDir *dir = NULL;
- 	GError *error = NULL;
- 	UpDeviceKind type = UP_DEVICE_KIND_UNKNOWN;
-+	guint i;
-+	const char *class[] = { "hid", "bluetooth" };
- 
- 	up_device_supply_reset_values (supply);
- 
-@@ -970,28 +973,39 @@ up_device_supply_coldplug (UpDevice *device)
- 		if (g_ascii_strcasecmp (device_type, "mains") == 0) {
- 			type = UP_DEVICE_KIND_LINE_POWER;
- 		} else if (g_ascii_strcasecmp (device_type, "battery") == 0) {
-+			for (i = 0; i < G_N_ELEMENTS(class) && type == UP_DEVICE_KIND_UNKNOWN; i++) {
-+				/* Detect if the battery comes from bluetooth keyboard or mouse. */
-+				bluetooth = g_udev_device_get_parent_with_subsystem (native, class[i], NULL);
-+				if (bluetooth != NULL) {
-+					device_path = g_udev_device_get_sysfs_path (bluetooth);
-+
-+					/* There may be an extra subdirectory here */
-+					subdir = g_build_filename (device_path, "input", NULL);
-+					if (!g_file_test (subdir, G_FILE_TEST_IS_DIR)) {
-+						g_free(subdir);
-+						subdir = g_strdup (device_path);
-+					}
- 
--			/* Detect if the battery comes from bluetooth keyboard or mouse. */
--			bluetooth = g_udev_device_get_parent_with_subsystem (native, "bluetooth", NULL);
--			if (bluetooth != NULL) {
--				device_path = g_udev_device_get_sysfs_path (bluetooth);
--				if ((dir = g_dir_open (device_path, 0, &error))) {
--					while ((file = g_dir_read_name (dir))) {
--						/* Check if it is an input device. */
--						if (g_str_has_prefix (file, "input")) {
--							input_path = g_build_filename (device_path, file, NULL);
--							break;
-+					if ((dir = g_dir_open (subdir, 0, &error))) {
-+						while ((file = g_dir_read_name (dir))) {
-+							/* Check if it is an input device. */
-+							if (g_str_has_prefix (file, "input")) {
-+								input_path = g_build_filename (subdir, file, NULL);
-+								break;
-+							}
- 						}
-+						g_dir_close (dir);
-+					} else {
-+						g_warning ("Can not open folder %s: %s", device_path, error->message);
-+						g_error_free (error);
- 					}
--					g_dir_close (dir);
--				} else {
--					g_warning ("Can not open folder %s: %s", device_path, error->message);
--					g_error_free (error);
-+					g_free (subdir);
-+					g_object_unref (bluetooth);
- 				}
--				g_object_unref (bluetooth);
--			}
- 
--			if (input_path != NULL) {
-+				if (input_path == NULL)
-+					continue;
-+
- 				if ((dir = g_dir_open (input_path, 0, &error))) {
- 					while ((file = g_dir_read_name (dir))) {
- 						/* Check if it is a mouse device. */
--- 
-2.6.3
-
diff --git a/source/a/upower/patches/rules-Add-support-for-Logitech-G700s-G700-Gaming-Mou.patch b/source/a/upower/patches/rules-Add-support-for-Logitech-G700s-G700-Gaming-Mou.patch
deleted file mode 100644
index 1826c416..00000000
--- a/source/a/upower/patches/rules-Add-support-for-Logitech-G700s-G700-Gaming-Mou.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 305f62adf052aa972523d083ca44d3050f659ec9 Mon Sep 17 00:00:00 2001
-From: muzena <trebelnik2@gmail.com>
-Date: Wed, 8 Jul 2015 17:11:25 +0200
-Subject: [PATCH 4/4] rules: Add support for Logitech G700s/G700 Gaming Mouse
-
-https://bugs.freedesktop.org/show_bug.cgi?id=91270
----
- rules/95-upower-csr.rules | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rules/95-upower-csr.rules b/rules/95-upower-csr.rules
-index 39539ca..3b83665 100644
---- a/rules/95-upower-csr.rules
-+++ b/rules/95-upower-csr.rules
-@@ -29,4 +29,5 @@ ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c532", DRIVER=="logitech-djdevice",
- ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", DRIVER=="logitech-hidpp-device", ENV{UPOWER_BATTERY_TYPE}="unifying"
- ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c532", DRIVER=="logitech-hidpp-device", ENV{UPOWER_BATTERY_TYPE}="unifying"
- ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52f", ENV{UPOWER_BATTERY_TYPE}="lg-wireless"
-+ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c531", ENV{UPOWER_BATTERY_TYPE}="lg-wireless"
- LABEL="up_unifying_end"
--- 
-2.6.4
-
diff --git a/source/a/upower/patches/rules-support-Logitech-Unifying-in-Linux-3.19.patch b/source/a/upower/patches/rules-support-Logitech-Unifying-in-Linux-3.19.patch
deleted file mode 100644
index adcba238..00000000
--- a/source/a/upower/patches/rules-support-Logitech-Unifying-in-Linux-3.19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f8104a112eb967cd4c2aaf57b5a59aafe7c4738f Mon Sep 17 00:00:00 2001
-From: Peter Wu <peter@lekensteyn.nl>
-Date: Wed, 21 Jan 2015 15:56:23 +0100
-Subject: [PATCH] rules: support Logitech Unifying in Linux 3.19
-
-Linux 3.19 changed the way in which devices get registered by
-introducing a hid-logitech-hidpp module. The driver name therefore needs
-to be adjusted.
-
-Signed-off-by: Peter Wu <peter@lekensteyn.nl>
----
- rules/95-upower-csr.rules | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/rules/95-upower-csr.rules b/rules/95-upower-csr.rules
-index b476660..39539ca 100644
---- a/rules/95-upower-csr.rules
-+++ b/rules/95-upower-csr.rules
-@@ -25,5 +25,8 @@ SUBSYSTEM!="hid", GOTO="up_unifying_end"
- ATTRS{idVendor}=="046d", ENV{UPOWER_VENDOR}="Logitech, Inc."
- ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", DRIVER=="logitech-djdevice", ENV{UPOWER_BATTERY_TYPE}="unifying"
- ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c532", DRIVER=="logitech-djdevice", ENV{UPOWER_BATTERY_TYPE}="unifying"
-+# These devices bind to the hid-logitech-hidpp module since Linux 3.19
-+ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", DRIVER=="logitech-hidpp-device", ENV{UPOWER_BATTERY_TYPE}="unifying"
-+ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c532", DRIVER=="logitech-hidpp-device", ENV{UPOWER_BATTERY_TYPE}="unifying"
- ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52f", ENV{UPOWER_BATTERY_TYPE}="lg-wireless"
- LABEL="up_unifying_end"
--- 
-2.6.3
-
diff --git a/source/a/upower/patches/upower-pm-utils-0.9.23-fix-segfault.patch b/source/a/upower/patches/upower-pm-utils-0.9.23-fix-segfault.patch
deleted file mode 100644
index 3e897632..00000000
--- a/source/a/upower/patches/upower-pm-utils-0.9.23-fix-segfault.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Fri, 08 Nov 2013 13:59:50 +0000
-Subject: lib: Fix segfault on getting property when daemon is not running
-
-This fixes "upower --version" when the daemon is not running, and thus the
-client proxy is NULL.
----
-diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
-index 35d7b5d..17fb02d 100644
---- a/libupower-glib/up-client.c
-+++ b/libupower-glib/up-client.c
-@@ -322,6 +322,9 @@ up_client_get_property (GObject *object,
- 	UpClient *client;
- 	client = UP_CLIENT (object);
- 
-+	if (client->priv->proxy == NULL)
-+                return;
-+
- 	switch (prop_id) {
- 	case PROP_DAEMON_VERSION:
- 		g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy));
---
-cgit v0.9.0.2-2-gbebe
diff --git a/source/a/upower/patches/upower.glib_2_58_1.diff b/source/a/upower/patches/upower.glib_2_58_1.diff
deleted file mode 100644
index 466fc71d..00000000
--- a/source/a/upower/patches/upower.glib_2_58_1.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./libupower-glib/up-wakeups.c.orig	2013-10-18 09:41:24.000000000 -0500
-+++ ./libupower-glib/up-wakeups.c	2018-11-20 23:07:29.603065864 -0600
-@@ -185,7 +185,7 @@
- 	return array;
- }
- 
--#pragma GCC diagnostic error "-Wdeprecated-declarations"
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- 
- /**
-  * up_wakeups_ensure_properties:
---- ./libupower-glib/up-device.c.orig	2013-10-18 09:41:24.000000000 -0500
-+++ ./libupower-glib/up-device.c	2018-11-20 23:07:24.435066237 -0600
-@@ -748,7 +748,7 @@
- 	return array;
- }
- 
--#pragma GCC diagnostic error "-Wdeprecated-declarations"
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- 
- /*
-  * up_device_set_property: