import libinput-1.13.2-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/libinput-1.12.3.tar.xz
+SOURCES/libinput-1.13.2.tar.xz

.libinput.metadata

@@ -1 +1 @@
-0b0b1285589bbe9924af81959ae1e6204e1c8a00 SOURCES/libinput-1.12.3.tar.xz
+7e9d1bb3f5d4f8809c829753791141416a67ab1f SOURCES/libinput-1.13.2.tar.xz

SOURCES/0001-Added-quirk-for-HP-Spectre-x360-Convertable-15-bl1xx.patch

@@ -1,29 +0,0 @@
-From 3bb62c973242957242061be86c90fa7f51df7789 Mon Sep 17 00:00:00 2001
-From: Arick McNiel-Cho <arickmcniel@yahoo.com>
-Date: Fri, 23 Nov 2018 15:10:15 -0600
-Subject: [PATCH libinput] Added quirk for HP Spectre x360 Convertable 15-bl1xx
- touchpad.
-
----
- quirks/50-system-hp.quirks | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/quirks/50-system-hp.quirks b/quirks/50-system-hp.quirks
-index ac50c09e8..3f38a5e1d 100644
---- a/quirks/50-system-hp.quirks
-+++ b/quirks/50-system-hp.quirks
-@@ -33,3 +33,11 @@ ModelHPZBookStudioG3=1
- MatchName=*Cypress APA Trackpad *cyapa*
- MatchDMIModalias=dmi:*svnHewlett-Packard*:pnFalco*
- AttrPressureRange=12:8
-+
-+[HP Spectre x360 Convertable 15-bl1xx]
-+MatchUdevType=touchpad
-+MatchName=*SynPS/2 Synaptics TouchPad
-+MatchDMIModalias=dmi:*svnHP:pnHPSpectrex360Convertible15-bl1XX:*
-+AttrPressureRange=55:40
-+AttrThumbPressureThreshold=90
-+AttrPalmPressureThreshold=100
--- 
-2.19.2
-

SOURCES/0001-Asus-VivoBook-Flip-14-TP412UA-tablet-mode-switch-mis.patch

@@ -1,33 +0,0 @@
-From 988d5b63287e5606f0c851ab3308e755bfac7d67 Mon Sep 17 00:00:00 2001
-From: Thomas Sailer <t.sailer@alumni.ethz.ch>
-Date: Thu, 3 Jan 2019 00:19:32 +0100
-Subject: [PATCH libinput] Asus VivoBook Flip 14 TP412UA tablet mode switch
- misbehaving
-
----
- quirks/50-system-asus.quirks | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/quirks/50-system-asus.quirks b/quirks/50-system-asus.quirks
-index 5299e1b8f..86d3dbd33 100644
---- a/quirks/50-system-asus.quirks
-+++ b/quirks/50-system-asus.quirks
-@@ -17,3 +17,15 @@ AttrPressureRange=24:10
- MatchName=*ETPS/2 Elantech Touchpad*
- MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnUX302LA:*
- AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
-+
-+# Asus VivoBook Flip 14 TP412UA tablet switch seems misbehaving, always
-+# indicating tablet position
-+[Asus TP412UA Keyboard]
-+MatchName=AT Translated Set 2 keyboard
-+MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
-+ModelTabletModeNoSuspend=1
-+
-+[Asus TP412UA Touchpad]
-+MatchName=*ELAN*Touchpad*
-+MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
-+ModelTabletModeNoSuspend=1
--- 
-2.19.2
-

SOURCES/0001-ModelTabletModeNoSuspend-1-is-currently-only-honored.patch

@@ -1,28 +0,0 @@
-From f9ec9b8f8d9e4ae18f9b8b3d7d602563eb0960e7 Mon Sep 17 00:00:00 2001
-From: Thomas Sailer <t.sailer@alumni.ethz.ch>
-Date: Thu, 3 Jan 2019 02:22:21 +0100
-Subject: [PATCH libinput] ModelTabletModeNoSuspend=1 is currently only honored
- for keyboards, but not touchpads. This commit changes that.
-
----
- src/evdev-mt-touchpad.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
-index b1a3632f5..650a193e7 100644
---- a/src/evdev-mt-touchpad.c
-+++ b/src/evdev-mt-touchpad.c
-@@ -2504,6 +2504,10 @@ tp_pair_tablet_mode_switch(struct evdev_device *touchpad,
- 	if (touchpad->tags & EVDEV_TAG_EXTERNAL_TOUCHPAD)
- 		return;
- 
-+	if (evdev_device_has_model_quirk(touchpad,
-+					 QUIRK_MODEL_TABLET_MODE_NO_SUSPEND))
-+		return;
-+
- 	evdev_log_debug(touchpad,
- 			"tablet_mode_switch: activated for %s<->%s\n",
- 			touchpad->devname,
--- 
-2.19.2
-

SOURCES/0001-quirks-add-a-quirk-for-the-Lenovo-T480s-clickpad.patch

@@ -1,78 +0,0 @@
-From 0cd65cf336c8cc242c471ac77aee7b7d816e7314 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 13 Dec 2018 12:06:53 +1000
-Subject: [PATCH libinput] quirks: add a quirk for the Lenovo T480s clickpad
-
-It's missing INPUT_PROP_BUTTONPAD but working kernel drivers prove to be
-elusive. Meanwhile, add a quirk here that force-enables this bit.
-
-Fixes #177
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- quirks/50-system-lenovo.quirks | 5 +++++
- src/evdev.c                    | 6 ++++++
- src/quirks.c                   | 1 +
- src/quirks.h                   | 1 +
- 4 files changed, 13 insertions(+)
-
-diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
-index 9fe961ad9..c45359e63 100644
---- a/quirks/50-system-lenovo.quirks
-+++ b/quirks/50-system-lenovo.quirks
-@@ -20,6 +20,11 @@ MatchName=Synaptics tm2964-001
- MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT440p*
- ModelLenovoT450Touchpad=1
- 
-+[Lenovo T480s Touchpad]
-+MatchName=Elan Touchpad
-+MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT480s*
-+ModelLenovoT480sTouchpad=1
-+
- [Lenovo X200 Trackpoint]
- MatchName=*TPPS/2 IBM TrackPoint
- MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX20?:*
-diff --git a/src/evdev.c b/src/evdev.c
-index 4a998f41c..ddd6d110b 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1908,6 +1908,12 @@ evdev_pre_configure_model_quirks(struct evdev_device *device)
- 		libevdev_enable_property(device->evdev,
- 					 INPUT_PROP_BUTTONPAD);
- 
-+	/* Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
-+	 * https://gitlab.freedesktop.org/libinput/libinput/issues/177 */
-+	if (evdev_device_has_model_quirk(device, QUIRK_MODEL_LENOVO_T480S_TOUCHPAD))
-+		libevdev_enable_property(device->evdev,
-+					 INPUT_PROP_BUTTONPAD);
-+
- 	/* Touchpad claims to have 4 slots but only ever sends 2
- 	 * https://bugs.freedesktop.org/show_bug.cgi?id=98100 */
- 	if (evdev_device_has_model_quirk(device, QUIRK_MODEL_HP_ZBOOK_STUDIO_G3))
-diff --git a/src/quirks.c b/src/quirks.c
-index debedfb69..fa12045b6 100644
---- a/src/quirks.c
-+++ b/src/quirks.c
-@@ -241,6 +241,7 @@ quirk_get_name(enum quirk q)
- 	case QUIRK_MODEL_HP_ZBOOK_STUDIO_G3:		return "ModelHPZBookStudioG3";
- 	case QUIRK_MODEL_LENOVO_SCROLLPOINT:		return "ModelLenovoScrollPoint";
- 	case QUIRK_MODEL_LENOVO_T450_TOUCHPAD:		return "ModelLenovoT450Touchpad";
-+	case QUIRK_MODEL_LENOVO_T480S_TOUCHPAD:		return "ModelLenovoT480sTouchpad";
- 	case QUIRK_MODEL_LENOVO_X230:			return "ModelLenovoX230";
- 	case QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD:	return "ModelSynapticsSerialTouchpad";
- 	case QUIRK_MODEL_SYSTEM76_BONOBO:		return "ModelSystem76Bonobo";
-diff --git a/src/quirks.h b/src/quirks.h
-index 735ed56dc..1d731a488 100644
---- a/src/quirks.h
-+++ b/src/quirks.h
-@@ -73,6 +73,7 @@ enum quirk {
- 	QUIRK_MODEL_HP_ZBOOK_STUDIO_G3,
- 	QUIRK_MODEL_LENOVO_SCROLLPOINT,
- 	QUIRK_MODEL_LENOVO_T450_TOUCHPAD,
-+	QUIRK_MODEL_LENOVO_T480S_TOUCHPAD,
- 	QUIRK_MODEL_LENOVO_X230,
- 	QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD,
- 	QUIRK_MODEL_SYSTEM76_BONOBO,
--- 
-2.19.2
-

SOURCES/0001-tools-make-the-tools-exit-with-exit-code-2-on-usage-.patch

@@ -1,172 +0,0 @@
-From 04a2e338707ec96bfdc9ee0dd8dc50b52991bafd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 1 Nov 2018 09:39:49 +1000
-Subject: [PATCH libinput] tools: make the tools exit with exit code 2 on usage
- issues
-
-This makes it easier to test for usage issues
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 36af7d312b5b10790bd19e3066eb1cd4e4e5f6d4)
----
- tools/libinput-debug-events.c | 12 ++++++------
- tools/libinput-debug-gui.c    | 10 +++++-----
- tools/libinput-list-devices.c |  2 +-
- tools/libinput-tool.c         |  4 ++--
- tools/shared.c                |  2 +-
- tools/shared.h                |  2 ++
- 6 files changed, 17 insertions(+), 15 deletions(-)
-
-diff --git a/tools/libinput-debug-events.c b/tools/libinput-debug-events.c
-index 87c31690f..0996a9495 100644
---- a/tools/libinput-debug-events.c
-+++ b/tools/libinput-debug-events.c
-@@ -954,11 +954,11 @@ main(int argc, char **argv)
- 
- 		switch(c) {
- 		case '?':
--			exit(1);
-+			exit(EXIT_INVALID_USAGE);
- 			break;
- 		case 'h':
- 			usage();
--			exit(0);
-+			exit(EXIT_SUCCESS);
- 			break;
- 		case OPT_SHOW_KEYCODES:
- 			show_keycodes = true;
-@@ -983,7 +983,7 @@ main(int argc, char **argv)
- 		default:
- 			if (tools_parse_option(c, optarg, &options) != 0) {
- 				usage();
--				return 1;
-+				return EXIT_INVALID_USAGE;
- 			}
- 			break;
- 		}
-@@ -992,16 +992,16 @@ main(int argc, char **argv)
- 
- 	if (optind < argc) {
- 		usage();
--		return 1;
-+		return EXIT_INVALID_USAGE;
- 	}
- 
- 	li = tools_open_backend(backend, seat_or_device, verbose, &grab);
- 	if (!li)
--		return 1;
-+		return EXIT_FAILURE;
- 
- 	mainloop(li);
- 
- 	libinput_unref(li);
- 
--	return 0;
-+	return EXIT_SUCCESS;
- }
-diff --git a/tools/libinput-debug-gui.c b/tools/libinput-debug-gui.c
-index 06ea0b819..b1c73ac39 100644
---- a/tools/libinput-debug-gui.c
-+++ b/tools/libinput-debug-gui.c
-@@ -957,7 +957,7 @@ main(int argc, char **argv)
- 
- 		switch(c) {
- 		case '?':
--			exit(1);
-+			exit(EXIT_INVALID_USAGE);
- 			break;
- 		case 'h':
- 			usage();
-@@ -980,7 +980,7 @@ main(int argc, char **argv)
- 		default:
- 			if (tools_parse_option(c, optarg, &options) != 0) {
- 				usage();
--				return 1;
-+				return EXIT_INVALID_USAGE;
- 			}
- 			break;
- 		}
-@@ -989,12 +989,12 @@ main(int argc, char **argv)
- 
- 	if (optind < argc) {
- 		usage();
--		return 1;
-+		return EXIT_INVALID_USAGE;
- 	}
- 
- 	li = tools_open_backend(backend, seat_or_device, verbose, &w.grab);
- 	if (!li)
--		return 1;
-+		return EXIT_FAILURE;
- 
- 	libinput_set_user_data(li, &w);
- 
-@@ -1008,5 +1008,5 @@ main(int argc, char **argv)
- 	window_cleanup(&w);
- 	libinput_unref(li);
- 
--	return 0;
-+	return EXIT_SUCCESS;
- }
-diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c
-index 5fa178854..4b06452ed 100644
---- a/tools/libinput-list-devices.c
-+++ b/tools/libinput-list-devices.c
-@@ -388,7 +388,7 @@ main(int argc, char **argv)
- 			return 0;
- 		} else {
- 			usage();
--			return 1;
-+			return EXIT_INVALID_USAGE;
- 		}
- 	}
- 
-diff --git a/tools/libinput-tool.c b/tools/libinput-tool.c
-index 30a64c270..7195de049 100644
---- a/tools/libinput-tool.c
-+++ b/tools/libinput-tool.c
-@@ -98,13 +98,13 @@ main(int argc, char **argv)
- 			return EXIT_SUCCESS;
- 		default:
- 			usage();
--			return EXIT_FAILURE;
-+			return EXIT_INVALID_USAGE;
- 		}
- 	}
- 
- 	if (optind >= argc) {
- 		usage();
--		return EXIT_FAILURE;
-+		return EXIT_INVALID_USAGE;
- 	}
- 
- 	argv += optind;
-diff --git a/tools/shared.c b/tools/shared.c
-index e3bc0287e..812870f68 100644
---- a/tools/shared.c
-+++ b/tools/shared.c
-@@ -576,7 +576,7 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv)
- 				"libinput: %s is not a libinput command or not installed. "
- 				"See 'libinput --help'\n",
- 				command);
--
-+			return EXIT_INVALID_USAGE;
- 		} else {
- 			fprintf(stderr,
- 				"Failed to execute '%s' (%s)\n",
-diff --git a/tools/shared.h b/tools/shared.h
-index 7888d265a..4e363e227 100644
---- a/tools/shared.h
-+++ b/tools/shared.h
-@@ -30,6 +30,8 @@
- #include <quirks.h>
- #include <libinput.h>
- 
-+#define EXIT_INVALID_USAGE 2
-+
- enum configuration_options {
- 	OPT_TAP_ENABLE = 256,
- 	OPT_TAP_DISABLE,
--- 
-2.19.1
-

SPECS/libinput.spec

@@ -4,8 +4,8 @@
 %global gitversion 58abea394
 
 Name:           libinput
-Version:        1.12.3
+Version:        1.13.2
-Release:        3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 Summary:        Input device library
 
 License:        MIT
@@ -18,14 +18,6 @@ Source2:        commitid
 Source0:        http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
 %endif
 
-Patch01:        0001-tools-make-the-tools-exit-with-exit-code-2-on-usage-.patch
-# Bug 1658604 - Enable full capabilities of the touchpad of the Lenovo T480s
-Patch02:        0001-quirks-add-a-quirk-for-the-Lenovo-T480s-clickpad.patch
-Patch03:        0001-Added-quirk-for-HP-Spectre-x360-Convertable-15-bl1xx.patch
-# Bug 1664225 - Quirk to ignore tablet modes cannot apply to touchpads
-Patch04:        0001-Asus-VivoBook-Flip-14-TP412UA-tablet-mode-switch-mis.patch
-Patch05:        0001-ModelTabletModeNoSuspend-1-is-currently-only-honored.patch
-
 BuildRequires:  git-core
 BuildRequires:  gcc gcc-c++
 BuildRequires:  meson
@@ -127,6 +119,9 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man1/libinput-record.1*
 %{_mandir}/man1/libinput-replay.1*
 
 %changelog
+* Thu May 09 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.13.2-1
+- libinput 1.13.3 (#1690212)
+
 * Fri Jan 11 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.12.3-3
 - Allow for the tablet mode quirk to apply to touchpads (#1664225)
 - Add a quirk for the Asus VivoBook Flip to keep the
@@ -137,7 +132,7 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man1/libinput-record.1*
 - Add a quirk for the HP Spectre x360
  
 * Tue Nov 13 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.12.3-1
-- libinput 1.13.3 (#1647294)
+- libinput 1.12.3 (#1647294)
 
 * Fri Nov 02 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.12.0-6
 - Backport event code disabling quirks (#1643815)