lib32-libinput: update to 1.12.1

3 files changed, 10 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2c35a16ecb3..72f4f8453ea1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-libinput
 	pkgdesc = Input device management and event handling library (32-bit)
-	pkgver = 1.12.0
-	pkgrel = 2
+	pkgver = 1.12.1
+	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/libinput/
 	arch = x86_64
 	license = custom:X11
@@ -12,13 +12,11 @@ pkgbase = lib32-libinput
 	depends = lib32-libevdev
 	depends = lib32-libwacom
 	depends = libinput
-	source = https://freedesktop.org/software/libinput/libinput-1.12.0.tar.xz
-	source = https://freedesktop.org/software/libinput/libinput-1.12.0.tar.xz.sig
-	source = 0001_Elan_Touchpads_quirks.patch
+	source = https://freedesktop.org/software/libinput/libinput-1.12.1.tar.xz
+	source = https://freedesktop.org/software/libinput/libinput-1.12.1.tar.xz.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha512sums = 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924
+	sha512sums = de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
 	sha512sums = SKIP
-	sha512sums = 8d603a04e1ef737f8627d75d2da97d5cee7607e2604a31105496a6ea2db632d40d04a567ce22ac2cd4765a2fd1ec4945032bad0b8c3b9ed4a9bd333886976570
 
 pkgname = lib32-libinput
 
diff --git a/0001_Elan_Touchpads_quirks.patch b/0001_Elan_Touchpads_quirks.patch
deleted file mode 100644
index 69bbdef8c4c0..000000000000
--- a/0001_Elan_Touchpads_quirks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From dcfea54787a3efe1f1ab44eef998c2a7a723d80a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 18 Sep 2018 07:02:27 +1000
-Subject: [PATCH] quirks: extend/restore the Elan Touchpads quirks
-
-The hwdb match entry used to be this one:
- libinput:name:*Elan Touchpad*:dt:*
-  LIBINPUT_ATTR_PRESSURE_RANGE=10:8
-from commit 596777a3147d4070f9598f051f6d7ae96fa2f49a. It was intended to match
-for devicetree only but the way the udev rules were composed, it ended up
-matching on any system.
-
-Restore that for all systems to have compatibility with 1.11. For this one,
-let's also add the resolution hint and hope that that works too.
-
-Fixes #140
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- quirks/30-vendor-elantech.quirks | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/quirks/30-vendor-elantech.quirks b/quirks/30-vendor-elantech.quirks
-index e49c3415..9b3a1ba7 100644
---- a/quirks/30-vendor-elantech.quirks
-+++ b/quirks/30-vendor-elantech.quirks
-@@ -4,3 +4,8 @@
- MatchName=*Elantech Touchpad*
- AttrResolutionHint=31x31
- AttrPressureRange=10:8
-+
-+[Elan Touchpads]
-+MatchName=*Elan Touchpad*
-+AttrResolutionHint=31x31
-+AttrPressureRange=10:8
--- 
-2.18.0
-
-
diff --git a/PKGBUILD b/PKGBUILD
index 316690480a1a..505089e09d23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _basename=libinput
 pkgname="lib32-$_basename"
-pkgver=1.12.0
-pkgrel=2
+pkgver=1.12.1
+pkgrel=1
 pkgdesc="Input device management and event handling library (32-bit)"
 url="https://www.freedesktop.org/wiki/Software/libinput/"
 arch=(x86_64)
@@ -12,19 +12,11 @@ license=(custom:X11)
 depends=('lib32-mtdev' 'lib32-systemd' 'lib32-libevdev' 'lib32-libwacom' "$_basename")
 # upstream doesn't recommend building docs
 makedepends=('lib32-gtk3' 'meson') # 'doxygen' 'graphviz' 'python-sphinx' 'python-recommonmark'
-source=(https://freedesktop.org/software/$_basename/$_basename-$pkgver.tar.xz{,.sig}
-        0001_Elan_Touchpads_quirks.patch)
-sha512sums=('4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924'
-            'SKIP'
-            '8d603a04e1ef737f8627d75d2da97d5cee7607e2604a31105496a6ea2db632d40d04a567ce22ac2cd4765a2fd1ec4945032bad0b8c3b9ed4a9bd333886976570')
+source=(https://freedesktop.org/software/$_basename/$_basename-$pkgver.tar.xz{,.sig})
+sha512sums=('de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68'
+            'SKIP')
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>0
 
-prepare() {
-  cd "${srcdir}/${_basename}-${pkgver}"
-  # FS#60072
-  patch -Np1 -i "${srcdir}/0001_Elan_Touchpads_quirks.patch"
-}
-
 build() {
   export CC='gcc -m32'
   export CXX='g++ -m32'