summaryrefslogtreecommitdiffstats
path: root/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-06-18 20:33:08 +0000
committer Eric Hameleers <alien@slackware.com>2021-06-19 02:59:56 +0200
commitd982348571d80dbef6cd54f4af963ffe8237b9a9 (patch)
tree8b84c61e396b2989872537d0e3b0ee7f5d683a5f /source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch
parent485160d3b1290e06e312141561f1f64c7ed64040 (diff)
downloadcurrent-d982348571d80dbef6cd54f4af963ffe8237b9a9.tar.gz
current-d982348571d80dbef6cd54f4af963ffe8237b9a9.tar.xz
Fri Jun 18 20:33:08 UTC 202120210618203308
a/kernel-generic-5.12.12-x86_64-1.txz: Upgraded. a/kernel-huge-5.12.12-x86_64-1.txz: Upgraded. a/kernel-modules-5.12.12-x86_64-1.txz: Upgraded. a/upower-0.99.12-x86_64-1.txz: Upgraded. d/kernel-headers-5.12.12-x86-1.txz: Upgraded. d/rust-1.53.0-x86_64-1.txz: Upgraded. k/kernel-source-5.12.12-noarch-1.txz: Upgraded. kde/kdeconnect-kde-21.04.2-x86_64-2.txz: Rebuilt. Recompiled against pulseaudio-qt-1.3. l/gdbm-1.20-x86_64-1.txz: Upgraded. n/bind-9.16.18-x86_64-1.txz: Upgraded. n/openvpn-2.5.3-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch')
-rw-r--r--source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch46
1 files changed, 0 insertions, 46 deletions
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
deleted file mode 100644
index f8fece700..000000000
--- a/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-