Sync changes to SLFO-1.2 branch

- Update to release 1.27.1
  * Fixed two regressions in the gesture state handling.
  * Removed an assert triggered by a finger count mismatch.
  * libinput replay has a slightly new output format and now
    supports Ctrl+C to stop the currently replaying event sequence.

OBS-URL: https://build.opensuse.org/request/show/1236128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libinput?expand=0&rev=122

kill-env.diff

@@ -3,12 +3,9 @@ Date: 2017-11-28 11:01:12.978019538 +0100
 
 Kill /usr/bin/env. We can't have random python interpreters be executed.
 ---
- test/test_quirks_files.py                   |    2 +-
- tools/libinput-analyze-buttons.py           |    2 +-
  tools/libinput-analyze-per-slot-delta.py    |    2 +-
  tools/libinput-analyze-recording.py         |    2 +-
  tools/libinput-analyze-touch-down-state.py  |    2 +-
- tools/libinput-list-kernel-devices.py       |    2 +-
  tools/libinput-measure-fuzz.py              |    2 +-
  tools/libinput-measure-touch-size.py        |    2 +-
  tools/libinput-measure-touchpad-pressure.py |    2 +-
@@ -16,154 +13,113 @@ Kill /usr/bin/env. We can't have random python interpreters be executed.
  tools/libinput-measure-touchpad-tap.py      |    2 +-
  tools/libinput-record-verify-yaml.py        |    2 +-
  tools/libinput-replay.py                    |    2 +-
- tools/razer-quirks-lister.py                |    2 +-
  tools/test_tool_option_parsing.py           |    2 +-
- 15 files changed, 15 insertions(+), 15 deletions(-)
+ 11 files changed, 11 insertions(+), 11 deletions(-)
 
-Index: libinput-1.30.0/test/test_quirks_files.py
+Index: libinput-1.17.0/tools/libinput-analyze-per-slot-delta.py
 ===================================================================
---- libinput-1.30.0.orig/test/test_quirks_files.py
-+++ libinput-1.30.0/test/test_quirks_files.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # This file is formatted with Python Black
- #
-Index: libinput-1.30.0/tools/libinput-analyze-buttons.py
-===================================================================
---- libinput-1.30.0.orig/tools/libinput-analyze-buttons.py
-+++ libinput-1.30.0/tools/libinput-analyze-buttons.py
+--- libinput-1.17.0.orig/tools/libinput-analyze-per-slot-delta.py
++++ libinput-1.17.0/tools/libinput-analyze-per-slot-delta.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # -*- coding: utf-8
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
-Index: libinput-1.30.0/tools/libinput-analyze-per-slot-delta.py
+Index: libinput-1.17.0/tools/libinput-analyze-recording.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-analyze-per-slot-delta.py
-+++ libinput-1.30.0/tools/libinput-analyze-per-slot-delta.py
+--- libinput-1.17.0.orig/tools/libinput-analyze-recording.py
++++ libinput-1.17.0/tools/libinput-analyze-recording.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # -*- coding: utf-8
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
-Index: libinput-1.30.0/tools/libinput-analyze-recording.py
+Index: libinput-1.17.0/tools/libinput-analyze-touch-down-state.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-analyze-recording.py
-+++ libinput-1.30.0/tools/libinput-analyze-recording.py
+--- libinput-1.17.0.orig/tools/libinput-analyze-touch-down-state.py
++++ libinput-1.17.0/tools/libinput-analyze-touch-down-state.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # -*- coding: utf-8
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
-Index: libinput-1.30.0/tools/libinput-analyze-touch-down-state.py
+Index: libinput-1.17.0/tools/libinput-measure-fuzz.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-analyze-touch-down-state.py
-+++ libinput-1.30.0/tools/libinput-analyze-touch-down-state.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8
- # vim: set expandtab shiftwidth=4:
- # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
-Index: libinput-1.30.0/tools/libinput-list-kernel-devices.py
-===================================================================
---- libinput-1.30.0.orig/tools/libinput-list-kernel-devices.py
-+++ libinput-1.30.0/tools/libinput-list-kernel-devices.py
+--- libinput-1.17.0.orig/tools/libinput-measure-fuzz.py
++++ libinput-1.17.0/tools/libinput-measure-fuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-measure-fuzz.py
+Index: libinput-1.17.0/tools/libinput-measure-touch-size.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-measure-fuzz.py
-+++ libinput-1.30.0/tools/libinput-measure-fuzz.py
+--- libinput-1.17.0.orig/tools/libinput-measure-touch-size.py
++++ libinput-1.17.0/tools/libinput-measure-touch-size.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-measure-touch-size.py
+Index: libinput-1.17.0/tools/libinput-measure-touchpad-pressure.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-measure-touch-size.py
-+++ libinput-1.30.0/tools/libinput-measure-touch-size.py
+--- libinput-1.17.0.orig/tools/libinput-measure-touchpad-pressure.py
++++ libinput-1.17.0/tools/libinput-measure-touchpad-pressure.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-measure-touchpad-pressure.py
+Index: libinput-1.17.0/tools/libinput-measure-touchpad-size.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-measure-touchpad-pressure.py
-+++ libinput-1.30.0/tools/libinput-measure-touchpad-pressure.py
+--- libinput-1.17.0.orig/tools/libinput-measure-touchpad-size.py
++++ libinput-1.17.0/tools/libinput-measure-touchpad-size.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-measure-touchpad-size.py
+Index: libinput-1.17.0/tools/libinput-measure-touchpad-tap.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-measure-touchpad-size.py
-+++ libinput-1.30.0/tools/libinput-measure-touchpad-size.py
+--- libinput-1.17.0.orig/tools/libinput-measure-touchpad-tap.py
++++ libinput-1.17.0/tools/libinput-measure-touchpad-tap.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-measure-touchpad-tap.py
+Index: libinput-1.17.0/tools/libinput-record-verify-yaml.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-measure-touchpad-tap.py
-+++ libinput-1.30.0/tools/libinput-measure-touchpad-tap.py
+--- libinput-1.17.0.orig/tools/libinput-record-verify-yaml.py
++++ libinput-1.17.0/tools/libinput-record-verify-yaml.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-record-verify-yaml.py
+Index: libinput-1.17.0/tools/libinput-replay.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-record-verify-yaml.py
-+++ libinput-1.30.0/tools/libinput-record-verify-yaml.py
+--- libinput-1.17.0.orig/tools/libinput-replay.py
++++ libinput-1.17.0/tools/libinput-replay.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3
  # vim: set expandtab shiftwidth=4:
  # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
  #
-Index: libinput-1.30.0/tools/libinput-replay.py
+Index: libinput-1.17.0/tools/test_tool_option_parsing.py
 ===================================================================
---- libinput-1.30.0.orig/tools/libinput-replay.py
-+++ libinput-1.30.0/tools/libinput-replay.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # vim: set expandtab shiftwidth=4:
- # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
- #
-Index: libinput-1.30.0/tools/razer-quirks-lister.py
-===================================================================
---- libinput-1.30.0.orig/tools/razer-quirks-lister.py
-+++ libinput-1.30.0/tools/razer-quirks-lister.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- #
- # SPDX-License-Identifier: MIT
- #
-Index: libinput-1.30.0/tools/test_tool_option_parsing.py
-===================================================================
---- libinput-1.30.0.orig/tools/test_tool_option_parsing.py
-+++ libinput-1.30.0/tools/test_tool_option_parsing.py
+--- libinput-1.17.0.orig/tools/test_tool_option_parsing.py
++++ libinput-1.17.0/tools/test_tool_option_parsing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/python3

libinput.changes

@@ -1,56 +1,3 @@
--------------------------------------------------------------------
-Mon Dec  8 10:09:17 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 1.30.1
- * Fixed a regression in the tablet handling code for some tablets
-   that send input events while being logically out of proximity.
- * Support for the INPUT_PROP_PRESSUREPAD property available in
-   Linux kernel 6.18.
-
--------------------------------------------------------------------
-Tue Nov 25 05:33:46 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 1.30
-  * touchpad: allow disabling the touchpad jumping cursor
-    detection, touchpad hysteresis, and palm dectection as a whole.
-  * Add quirks for Microsoft Surface Keyboard BTN_0, TongFang GX4
-    (X4SP4NAL) touchpad, the RazerBlade162025 keyboard, HP OmniBook
-    Ultra Flip Laptop 14-fh0xxx, GPD MicroPC 2 touchpad, ROG Flow
-    Z13 2025 (GZ302EA) keyboard, Nulea M501 thumb trackball, Dell
-    laptops, Google Chromebook Roric/Rull, MX Master 4.
-
--------------------------------------------------------------------
-Tue Oct 21 08:48:42 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 1.29.2
-  * A potential crasher caused by abort if the dial/ring/strip
-    pad mode group was not found, was fixed.
-  * A zero delta timestamp caused the custom pointer acceleration
-    to jump to 0/0 when clicking a button.
-  * A missing forced proximity out event could cause two tablet
-    tools to be in proximity at the same time. This could cause GTK
-    applications to crash.
-
--------------------------------------------------------------------
-Thu Jul 31 10:35:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 1.29
-  * High-resolution scroll wheels have better heuristics to avoid
-    inadvertent scrolls. This should also help with
-    lesser-resolution scroll wheels which can skip those heuristics
-    now, resulting in better responsiveness.
-  * Virtual devices (e.g. uinput) are now detected in libinput and
-    some internal heuristics are disabled for those (e.g. tablet
-    smoothing).
-  * Tablet tools with an fixed eraser button (almost all these
-    days) can now configure that eraser button to be a regular
-    button instead.
-  * Jumping cursors on Asus "ASUE..." touchpads have lost their
-    excitement and are no longer jumping.
-  * libinput debug-tablet-pad is a new tool for interactive tablet
-    pad debugging.
-- Delete pkgconf.patch (merged)
-
 -------------------------------------------------------------------
 Thu May 29 13:39:19 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
 

libinput.spec

@@ -37,7 +37,7 @@
 %define lname	libinput10
 %define pname	libinput
 Name:           libinput%{?xsuffix}
-Version:        1.30.1
+Version:        1.28.1
 Release:        0
 Summary:        Input device and event processing library
 License:        MIT
@@ -49,6 +49,7 @@ Source:         https://gitlab.freedesktop.org/libinput/libinput/-/archive/%vers
 Source3:        baselibs.conf
 Source5:        libinput-rpmlintrc
 Patch1:         kill-env.diff
+Patch2:         pkgconf.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -144,7 +145,7 @@ to develop applications that require libinput.
 	-Dtests=false \
 	-Ddebug-gui=%{?with_debug_gui:true}%{!?with_debug_gui:false} \
 	-Ddocumentation=%{?with_documentation:true}%{!?with_documentation:false} \
-	-Dlua-plugins=disabled
+	%nil
 %meson_build
 
 %install

pkgconf.patch

@@ -0,0 +1,36 @@
+From e453ad51ae29b4a1282795ded83f63223d36fe89 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 29 May 2025 15:35:11 +0200
+Subject: [PATCH] Teach meson about pkgconfig Requires.private
+References: https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1207
+References: https://bugzilla.suse.com/show_bug.cgi?id=1242039
+
+Fixes: ed87c6dbb0059cc6cdf79b1086c2034a8970fbf6
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 98e500b2..a4bc11af 100644
+--- a/meson.build
++++ b/meson.build
+@@ -439,12 +439,14 @@ if meson.version().version_compare('>= 0.54.0')
+ 	meson.override_dependency('libinput', dep_libinput)
+ endif
+ 
++# Hol' up, keep this synchronized with src/libinput.pc.in
+ pkgconfig.generate(
+ 	filebase : 'libinput',
+ 	name : 'Libinput',
+ 	description : 'Input device library',
+ 	version : meson.project_version(),
+-	libraries : lib_libinput
++	libraries : lib_libinput,
++	requires_private : 'libudev'
+ )
+ 
+ git_version_h = vcs_tag(command : ['git', 'describe'],
+-- 
+2.49.0
+