From 9a10f4b8076e19868cd795d3cfb2e874b02ed455 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mar 14 2018 11:06:23 +0000 Subject: libinput 1.10.3 --- diff --git a/.gitignore b/.gitignore index 333adda..70fbda4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /libinput-1.10.0.tar.xz /libinput-1.10.1.tar.xz /libinput-1.10.2.tar.xz +/libinput-1.10.3.tar.xz diff --git a/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch b/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch deleted file mode 100644 index 3080187..0000000 --- a/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 42e8813a632699e55f8287430f458ae6f5312146 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 12 Mar 2018 10:33:21 +1000 -Subject: [PATCH libinput] touchpad: end hovering touches in maybe_end_touch - -Otherwise a hovering touch stays around forever even after the finger has -discontinued. This doesn't matter on slots, but for fake fingers the finger -may suddenly end up being forced down/up as a result of the pressure changes -on the real fingers. - -So when in maybe_end_touch, switch them back to NONE immediately - hovering -touches do not need to trigger a TOUCH_END event. - -https://bugs.freedesktop.org/show_bug.cgi?id=105258 - -Signed-off-by: Peter Hutterer -(cherry picked from commit d8db6b5927f61460b2991479a85056256c819485) ---- - src/evdev-mt-touchpad.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index 3080e8a8..4ebadc25 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -345,22 +345,26 @@ tp_maybe_end_touch(struct tp_dispatch *tp, - switch (t->state) { - case TOUCH_NONE: - case TOUCH_MAYBE_END: -- case TOUCH_HOVERING: - return; - case TOUCH_END: - evdev_log_bug_libinput(tp->device, - "touch already in TOUCH_END\n"); - return; -+ case TOUCH_HOVERING: - case TOUCH_BEGIN: - case TOUCH_UPDATE: - break; - } - -- t->dirty = true; -- t->state = TOUCH_MAYBE_END; -+ if (t->state != TOUCH_HOVERING) { -+ assert(tp->nfingers_down >= 1); -+ tp->nfingers_down--; -+ t->state = TOUCH_MAYBE_END; -+ } else { -+ t->state = TOUCH_NONE; -+ } - -- assert(tp->nfingers_down >= 1); -- tp->nfingers_down--; -+ t->dirty = true; - } - - /** --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 385b61d..6d4d9d6 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.2 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.3 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,8 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -111,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Mar 14 2018 Peter Hutterer 1.10.3-1 +- libinput 1.10.3 + * Mon Mar 12 2018 Peter Hutterer 1.10.2-4 - Fix occasional crashes on gestures when libinput loses track of hovering fake fingers diff --git a/sources b/sources index 2dbd3d3..ae22223 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.2.tar.xz) = c0418b2e0919fe085839a9ce7d4f155ea7a76f5395f5ed0ab7ab2f2226a2085b10ada5006bfb64c65d98a5fcc19395f722de379f0977a6c52a3630a9c0ad556e +SHA512 (libinput-1.10.3.tar.xz) = 4c73673e138a7aff9d6f2d189b8afdfb51c868eca0487c8c487ffd3bb48849994a9095fbd4c5c725ee17fafc2a85298106e0cc7b59b4a8cd13ec28f65d15c01d