summaryrefslogtreecommitdiffstats
path: root/source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-11-27 06:21:11 +0000
committer Eric Hameleers <alien@slackware.com>2020-11-27 17:59:51 +0100
commitdbf5c1c4390d04802e7b37be3d2012bb8eae6675 (patch)
treea260819b01cff1e22c878b55baf3b971bea14357 /source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch
parent042736eeb574486635e076ffcc36593ac09c72ba (diff)
downloadcurrent-dbf5c1c4390d04802e7b37be3d2012bb8eae6675.tar.gz
current-dbf5c1c4390d04802e7b37be3d2012bb8eae6675.tar.xz
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.
Diffstat (limited to 'source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch')
-rw-r--r--source/a/upower/patches/linux-Properly-detect-bluetooth-mice-and-keyboards-t.patch141
1 files changed, 0 insertions, 141 deletions
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 55de33b7d..000000000
--- 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
-