From 09a826f5ee18749b2436cd4929d2e49a1b1a8f1b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Apr 2018 12:31:15 +1000 Subject: [PATCH] libinput 1.10.5 --- .gitignore | 1 + ...S_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch | 22 +++++++++---------- libinput.spec | 7 ++++-- sources | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 2125d0b..f0297c4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /libinput-1.10.2.tar.xz /libinput-1.10.3.tar.xz /libinput-1.10.4.tar.xz +/libinput-1.10.5.tar.xz diff --git a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch index fe27148..8d14de1 100644 --- a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch +++ b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch @@ -1,4 +1,4 @@ -From 0ae123afac8abffd843efcc899ef4519611f1ee2 Mon Sep 17 00:00:00 2001 +From 4fb3f9e1d4de48853e2cdc43300e4d1fa41550b3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Apr 2018 11:00:51 +1000 Subject: [PATCH libinput] evdev: disable ABS_MT_TOOL_PALM on the Lenovo X1 @@ -21,10 +21,10 @@ Signed-off-by: Peter Hutterer 3 files changed, 13 insertions(+) diff --git a/src/evdev.c b/src/evdev.c -index b98dc32d..8dbf12c6 100644 +index 13b2b13c..a145a03b 100644 --- a/src/evdev.c +++ b/src/evdev.c -@@ -1265,6 +1265,7 @@ evdev_read_model_flags(struct evdev_device *device) +@@ -1272,6 +1272,7 @@ evdev_read_model_flags(struct evdev_device *device) MODEL(LOGITECH_MARBLE_MOUSE), MODEL(TABLET_NO_PROXIMITY_OUT), MODEL(MS_NANO_TRANSCEIVER), @@ -32,7 +32,7 @@ index b98dc32d..8dbf12c6 100644 #undef MODEL { "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL }, { NULL, EVDEV_MODEL_DEFAULT }, -@@ -1861,6 +1862,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) +@@ -1868,6 +1869,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) /* Logitech Marble Mouse claims to have a middle button */ if (device->model_flags & EVDEV_MODEL_LOGITECH_MARBLE_MOUSE) libevdev_disable_event_code(device->evdev, EV_KEY, BTN_MIDDLE); @@ -47,24 +47,24 @@ index b98dc32d..8dbf12c6 100644 static void diff --git a/src/evdev.h b/src/evdev.h -index 060020f9..07941c3d 100644 +index 496bea7f..cdcaf8f9 100644 --- a/src/evdev.h +++ b/src/evdev.h -@@ -111,6 +111,7 @@ enum evdev_device_model { - EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9), +@@ -112,6 +112,7 @@ enum evdev_device_model { EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), + EVDEV_MODEL_LOGITECH_K400 = (1 << 11), EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), + EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13), EVDEV_MODEL_CYBORG_RAT = (1 << 14), EVDEV_MODEL_HP_STREAM11_TOUCHPAD = (1 << 16), EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index 20975aec..060018b0 100644 +index 7470973f..6f625017 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb -@@ -210,6 +210,10 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd - libinput:keyboard:input:b0003v17EFp6047* - LIBINPUT_ATTR_KEYBOARD_INTEGRATION=external +@@ -232,6 +232,10 @@ libinput:keyboard:input:b0003v17EFp6047* + libinput:name:*ALPS TrackPoint*:svnLENOVO:*:pvrThinkPadX280:* + LIBINPUT_ATTR_TRACKPOINT_RANGE=70 +# Lenovo Carbon X1 6th gen (RMI4 only, PS/2 is broken on this device) +libinput:name:Synaptics TM3288-010:dmi:*svnLenovo:*pvrThinkPadX1Carbon6th:* diff --git a/libinput.spec b/libinput.spec index 1ba78ce..c0940d0 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.4 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.5 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -111,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Thu Apr 19 2018 Peter Hutterer 1.10.5-1 +- libinput 1.10.5 + * Thu Apr 19 2018 Peter Hutterer 1.10.4-2 - Disable ABS_MT_TOOL_PALM on the Lenovo Carbon X1 6th (#1565692) diff --git a/sources b/sources index e890da2..2ce19c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.4.tar.xz) = b6f24f135e2396d53c0576a3b3887cd3736f2209fc448c6419cd1f1d7ee6aedff8e067f4b780f50ada5a4418d5bc47a4010cb328f366ee7fd1a2dba1ffc96c38 +SHA512 (libinput-1.10.5.tar.xz) = 61f19ea777b523f0e76869b8e7dbbff5e51132d3c856c6edb9915a695f7903256228e71be2567642866923a800f1283bdd5aff97266ac26c2e42dfce0bffa50b