From 7d0229c8c72939070a3fa04b8f60054af8ccd92e8074b7101d88b85f75475c00 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 11 Sep 2018 08:22:29 +0000 Subject: [PATCH 1/2] - Update to new upstream release 1.12.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libinput?expand=0&rev=174 --- kill-env.diff | 40 ++++++++++++++++++------------------- libinput-1.11.3.tar.xz | 3 --- libinput-1.11.3.tar.xz.sig | Bin 95 -> 0 bytes libinput-1.12.0.tar.xz | 3 +++ libinput-1.12.0.tar.xz.sig | Bin 0 -> 95 bytes libinput.changes | 14 +++++++++++++ libinput.spec | 21 +++++++++++++++---- 7 files changed, 54 insertions(+), 27 deletions(-) delete mode 100644 libinput-1.11.3.tar.xz delete mode 100644 libinput-1.11.3.tar.xz.sig create mode 100644 libinput-1.12.0.tar.xz create mode 100644 libinput-1.12.0.tar.xz.sig diff --git a/kill-env.diff b/kill-env.diff index e6c0ba1..c065585 100644 --- a/kill-env.diff +++ b/kill-env.diff @@ -3,57 +3,57 @@ Date: 2017-11-28 11:01:12.978019538 +0100 Kill /usr/bin/env. We can't have random python interpreters be executed. --- - tools/libinput-measure-touch-size | 2 +- - tools/libinput-measure-touchpad-pressure | 2 +- - tools/libinput-measure-touchpad-tap | 2 +- - tools/libinput-measure-trackpoint-range | 2 +- - udev/parse_hwdb.py | 2 +- + tools/libinput-measure-fuzz.py | 2 +- + tools/libinput-measure-touch-size.py | 2 +- + tools/libinput-measure-touchpad-pressure.py | 2 +- + tools/libinput-measure-touchpad-tap.py | 2 +- + tools/libinput-replay | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -Index: libinput-1.10.5/tools/libinput-measure-touch-size +Index: libinput-1.12.0/tools/libinput-measure-fuzz.py =================================================================== ---- libinput-1.10.5.orig/tools/libinput-measure-touch-size -+++ libinput-1.10.5/tools/libinput-measure-touch-size +--- libinput-1.12.0.orig/tools/libinput-measure-fuzz.py ++++ libinput-1.12.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.10.5/tools/libinput-measure-touchpad-pressure +Index: libinput-1.12.0/tools/libinput-measure-touch-size.py =================================================================== ---- libinput-1.10.5.orig/tools/libinput-measure-touchpad-pressure -+++ libinput-1.10.5/tools/libinput-measure-touchpad-pressure +--- libinput-1.12.0.orig/tools/libinput-measure-touch-size.py ++++ libinput-1.12.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.10.5/tools/libinput-measure-touchpad-tap +Index: libinput-1.12.0/tools/libinput-measure-touchpad-pressure.py =================================================================== ---- libinput-1.10.5.orig/tools/libinput-measure-touchpad-tap -+++ libinput-1.10.5/tools/libinput-measure-touchpad-tap +--- libinput-1.12.0.orig/tools/libinput-measure-touchpad-pressure.py ++++ libinput-1.12.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.10.5/tools/libinput-measure-trackpoint-range +Index: libinput-1.12.0/tools/libinput-measure-touchpad-tap.py =================================================================== ---- libinput-1.10.5.orig/tools/libinput-measure-trackpoint-range -+++ libinput-1.10.5/tools/libinput-measure-trackpoint-range +--- libinput-1.12.0.orig/tools/libinput-measure-touchpad-tap.py ++++ libinput-1.12.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.10.5/udev/parse_hwdb.py +Index: libinput-1.12.0/tools/libinput-replay =================================================================== ---- libinput-1.10.5.orig/udev/parse_hwdb.py -+++ libinput-1.10.5/udev/parse_hwdb.py +--- libinput-1.12.0.orig/tools/libinput-replay ++++ libinput-1.12.0/tools/libinput-replay @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 diff --git a/libinput-1.11.3.tar.xz b/libinput-1.11.3.tar.xz deleted file mode 100644 index 6cb652f..0000000 --- a/libinput-1.11.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f31191d96e425b4f16319842279d65946d9d983dcd3d9e466ae1206aa10ecb06 -size 487408 diff --git a/libinput-1.11.3.tar.xz.sig b/libinput-1.11.3.tar.xz.sig deleted file mode 100644 index 939852f08e2ef60ffb86a4f5cbfebe1de93be665a9fb8c4e7a1cd075dbb70b29..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WUx`Hj~ANI2{MMp3`WZ>cyfQe|GWti{b vvGJjZ`t(le%T1zFA2J9h=VVM~Sg@j7#;)bh@;kQtVt*n%_jiBz$-xEyh3F<= diff --git a/libinput-1.12.0.tar.xz b/libinput-1.12.0.tar.xz new file mode 100644 index 0000000..21a077f --- /dev/null +++ b/libinput-1.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15ac2b78ec0b502c14400d711dbd6b9164a43a724cedeaf21c7fa29960e701a4 +size 519320 diff --git a/libinput-1.12.0.tar.xz.sig b/libinput-1.12.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..053de5624d8674285bd518d705867f4591bd8b2e0868aa9480fa6333d8b04b1c GIT binary patch literal 95 zcmeB(WnmCxVvrS6WUx`Hj~ANI2{MNhYkV&LKwfQj(2G0gX3 vEb!i!cr16*H7_fp=@;9k?v-L-Sg@>s{a07eYKxLtYj3zRug*Wk=E)5JYKJ8z literal 0 HcmV?d00001 diff --git a/libinput.changes b/libinput.changes index d4297e6..8bfc7bf 100644 --- a/libinput.changes +++ b/libinput.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Sep 11 07:55:44 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 1.12.0 + * Fixed: The tablet axis smoothing previously caused some axes + to change value even though the "axis has changed" bit wasn't + set in the event. + * The delta for tablet axis events is now always 0 for tip + up/down events. This works around the pointer jumps seen on + some devices when the tip is pressed/released. + * The fuzz handling (i.e. hysteresis auto-detection) was + restored after being accidentally removed during the + hwdb->quirks rework. + ------------------------------------------------------------------- Fri Jul 27 06:39:22 UTC 2018 - kbabioch@suse.com diff --git a/libinput.spec b/libinput.spec index 2fdc11c..979094b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -22,7 +22,7 @@ Name: libinput %define lname libinput10 -Version: 1.11.3 +Version: 1.12.0 Release: 0 Summary: Input device and event processing library License: MIT @@ -73,6 +73,7 @@ physical device. Summary: Input device and event processing library Group: System/Libraries Recommends: %name-udev +Requires: %name-data = %version %description -n %lname libinput is a library that handles input devices for display servers and @@ -83,6 +84,16 @@ processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. +%package data +Summary: Hardware quirk database for libinput +Group: System/Libraries + +%description data +libinput is a library that handles input devices for display servers and +other applications that need to directly deal with input devices. + +This package contains hardware-specific quirk lists. + %package tools Summary: Utilities to display libinput configuration Group: System/X11/Utilities @@ -110,7 +121,7 @@ to develop applications that require libinput. %meson \ --includedir="%_includedir/%name" \ -Dudev-dir="%_prefix/lib/udev" \ - -Dtests=false \ + -Dtests=false -Ddocumentation=false %{!?use_wacom:-Dlibwacom=false} \ %nil %meson_build @@ -129,10 +140,9 @@ perl -i -pe 's{#!/usr/bin/env python}{#!/usr/bin/python}g' \ [ -x /usr/bin/udevadm ] && /usr/bin/udevadm hwdb --update || : %files udev -%_prefix/lib/udev/hwdb.d %_prefix/lib/udev/libinput-device-group %_prefix/lib/udev/libinput-model-quirks -%_prefix/lib/udev/rules.d +%_prefix/lib/udev/rules.d/ %files -n %lname %license COPYING @@ -143,6 +153,9 @@ perl -i -pe 's{#!/usr/bin/env python}{#!/usr/bin/python}g' \ %_libexecdir/libinput/ %_mandir/man1/* +%files data +%_datadir/libinput/ + %files devel %_includedir/%name/ %_libdir/pkgconfig/libinput.pc From 5d590299db112cc6d613d75aca97408c24f5470dee0474cc1d6c4b94a70f565f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 11 Sep 2018 08:26:42 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libinput?expand=0&rev=175 --- libinput.spec | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libinput.spec b/libinput.spec index 979094b..7816e2b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -73,7 +73,6 @@ physical device. Summary: Input device and event processing library Group: System/Libraries Recommends: %name-udev -Requires: %name-data = %version %description -n %lname libinput is a library that handles input devices for display servers and @@ -84,16 +83,6 @@ processing and abstraction so minimize the amount of custom input code the user of libinput need to provide the common set of functionality that users expect. -%package data -Summary: Hardware quirk database for libinput -Group: System/Libraries - -%description data -libinput is a library that handles input devices for display servers and -other applications that need to directly deal with input devices. - -This package contains hardware-specific quirk lists. - %package tools Summary: Utilities to display libinput configuration Group: System/X11/Utilities @@ -120,6 +109,7 @@ to develop applications that require libinput. %build %meson \ --includedir="%_includedir/%name" \ + --datadir="%_datadir/%name-%version" \ -Dudev-dir="%_prefix/lib/udev" \ -Dtests=false -Ddocumentation=false %{!?use_wacom:-Dlibwacom=false} \ @@ -147,15 +137,13 @@ perl -i -pe 's{#!/usr/bin/env python}{#!/usr/bin/python}g' \ %files -n %lname %license COPYING %_libdir/libinput.so.10* +%_datadir/libinput-%version/ %files tools %_bindir/libinput %_libexecdir/libinput/ %_mandir/man1/* -%files data -%_datadir/libinput/ - %files devel %_includedir/%name/ %_libdir/pkgconfig/libinput.pc