From 85ae930e2237d1909791b97feb71783dd896d397 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 5 Jun 2018 10:32:36 +1000
Subject: [PATCH] libinput 1.11.0

---
 .gitignore                                    |  1 +
 ...-the-trackpoint-sensitivity-directly.patch | 55 -------------------
 libinput.spec                                 | 10 ++--
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 61 deletions(-)
 delete mode 100644 0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch

diff --git a/.gitignore b/.gitignore
index 93fc81f..dd665e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /libinput-1.10.7.tar.xz
 /libinput-1.10.901.tar.xz
 /libinput-1.10.902.tar.xz
+/libinput-1.11.0.tar.xz
diff --git a/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch b/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch
deleted file mode 100644
index e6186c5..0000000
--- a/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 4b9050a0c18ea679bd8ca85ec92c9090b01974ca Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 1 Jun 2018 11:19:49 +1000
-Subject: [PATCH libinput] Revert "udev: copy the trackpoint sensitivity
- directly from sysfs"
-
-The lenovo compact keyboard with trackpoint has a sensitivity of 5, which
-causes the trackpoint range to be 0.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1583324
-
-This reverts commit a4036a33ca6ca8da7d2417cac6b840a89b295e5f.
----
- src/evdev.c                            | 4 ++--
- udev/90-libinput-model-quirks.rules.in | 4 ----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 1ac5b4f0..4da80a1f 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1194,7 +1194,7 @@ evdev_get_trackpoint_range(struct evdev_device *device)
- 		       HTTP_DOC_LINK);
- 
- 	prop = udev_device_get_property_value(device->udev_device,
--					      "LIBINPUT_ATTR_TRACKPOINT_SENSITIVITY");
-+					      "POINTINGSTICK_SENSITIVITY");
- 	if (prop) {
- 		int sensitivity;
- 
-@@ -1210,7 +1210,7 @@ evdev_get_trackpoint_range(struct evdev_device *device)
- 			sensitivity/DEFAULT_TRACKPOINT_SENSITIVITY;
- 
- 		evdev_log_debug(device,
--				"trackpoint sensitivity is %d\n",
-+				"trackpoint udev sensitivity is %d\n",
- 				sensitivity);
- 	}
- 
-diff --git a/udev/90-libinput-model-quirks.rules.in b/udev/90-libinput-model-quirks.rules.in
-index cab8dcda..75d5b368 100644
---- a/udev/90-libinput-model-quirks.rules.in
-+++ b/udev/90-libinput-model-quirks.rules.in
-@@ -39,8 +39,4 @@ KERNELS=="input*", \
- KERNELS=="input*", \
-   IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:dt:$attr{[devicetree/base]model}'"
- 
--ENV{ID_INPUT_POINTINGSTICK}=="1", \
--  ATTRS{sensitivity}=="?*", \
--  ENV{LIBINPUT_ATTR_TRACKPOINT_SENSITIVITY}="$attr{sensitivity}"
--
- LABEL="libinput_model_quirks_end"
--- 
-2.14.3
-
diff --git a/libinput.spec b/libinput.spec
index 9fc7cd9..21eb637 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -4,8 +4,8 @@
 %global gitversion 58abea394
 
 Name:           libinput
-Version:        1.10.902
-Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:        1.11.0
+Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 Summary:        Input device library
 
 License:        MIT
@@ -18,9 +18,6 @@ Source2:        commitid
 Source0:        http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
 %endif
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1583324
-Patch01:        0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch
-
 BuildRequires:  git-core
 BuildRequires:  gcc gcc-c++
 BuildRequires:  meson
@@ -116,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze
 %{_mandir}/man1/libinput-replay.1*
 
 %changelog
+* Tue Jun 05 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.11.0-1
+- libinput 1.11.0
+
 * Fri Jun 01 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.10.902-2
 - Revert direct sensitivity attribute reading (#1583324)
 
diff --git a/sources b/sources
index 70d0844..d1595ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libinput-1.10.902.tar.xz) = c7c3da905852312e0b522b9356bf03ba5cb424020e0caf41cbd36fc22a6d337c2faebb878c01f958e7c078c9608f311b00190e8690b242000c6197a91d05e9a2
+SHA512 (libinput-1.11.0.tar.xz) = 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857