diff --git a/.gitignore b/.gitignore index 5affb83..e4770a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/libinput-1.5.901.tar.xz -/libinput-1.5.902.tar.xz -/libinput-1.6.0.tar.xz +/libinput-1.6.1.tar.xz diff --git a/0001-Revert-touchpad-reduce-the-initial-timeout-for-tappi.patch b/0001-Revert-touchpad-reduce-the-initial-timeout-for-tappi.patch deleted file mode 100644 index 6a15c0c..0000000 --- a/0001-Revert-touchpad-reduce-the-initial-timeout-for-tappi.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 06190393dd5991149a117d4630c95e23d390865e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 1 Feb 2017 15:01:15 +1000 -Subject: [PATCH libinput] Revert "touchpad: reduce the initial timeout for - tapping after touch" - -This reverts commit d0ba1e2b383acaac8a31a1ded7d3039bcd161db3. ---- - src/evdev-mt-touchpad-tap.c | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c -index ffd9d0b..03d4c70 100644 ---- a/src/evdev-mt-touchpad-tap.c -+++ b/src/evdev-mt-touchpad-tap.c -@@ -33,7 +33,6 @@ - - #include "evdev-mt-touchpad.h" - --#define DEFAULT_TAP_INITIAL_TIMEOUT_PERIOD ms2us(100) - #define DEFAULT_TAP_TIMEOUT_PERIOD ms2us(180) - #define DEFAULT_DRAG_TIMEOUT_PERIOD ms2us(300) - #define DEFAULT_TAP_MOVE_THRESHOLD TP_MM_TO_DPI_NORMALIZED(1.3) -@@ -128,13 +127,6 @@ tp_tap_notify(struct tp_dispatch *tp, - } - - static void --tp_tap_set_initial_timer(struct tp_dispatch *tp, uint64_t time) --{ -- libinput_timer_set(&tp->tap.timer, -- time + DEFAULT_TAP_INITIAL_TIMEOUT_PERIOD); --} -- --static void - tp_tap_set_timer(struct tp_dispatch *tp, uint64_t time) - { - libinput_timer_set(&tp->tap.timer, time + DEFAULT_TAP_TIMEOUT_PERIOD); -@@ -163,7 +155,7 @@ tp_tap_idle_handle_event(struct tp_dispatch *tp, - case TAP_EVENT_TOUCH: - tp->tap.state = TAP_STATE_TOUCH; - tp->tap.first_press_time = time; -- tp_tap_set_initial_timer(tp, time); -+ tp_tap_set_timer(tp, time); - break; - case TAP_EVENT_RELEASE: - break; --- -2.9.3 - diff --git a/libinput.spec b/libinput.spec index e268ee9..fd7b45d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.6.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.6.1 +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-Revert-touchpad-reduce-the-initial-timeout-for-tappi.patch - BuildRequires: git BuildRequires: autoconf automake libtool pkgconfig BuildRequires: libevdev-devel @@ -96,6 +94,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Thu Feb 02 2017 Peter Hutterer 1.6.1-1 +- libinput 1.6.1 + * Wed Feb 01 2017 Peter Hutterer 1.6.0-2 - revert the tap timeout reduction (#1414935) diff --git a/sources b/sources index 4f5db74..fd46d77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.6.0.tar.xz) = 0e52f70fc5b1aa1e9c0621770ba2530f1652611aff1a557ac8083559e22293942d7c468f9bafe9e97e4f71e71df6f3828f9949d8897bea26982045340e3edc92 +SHA512 (libinput-1.6.1.tar.xz) = b18fdbfa58c14d6a5d183da3c1097d31f7dd9cce41ea69ddfa0bbd1bf8572aaa8e1ecaacdc30e3cc5e21cd320ea106ec86800a24e8f571bce61a02ddc7d43511