lib32-libinput: add upstream patch

4 files changed, 53 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dfa100d8d56..d2c35a16ecb3 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 = 1
+	pkgrel = 2
 	url = https://www.freedesktop.org/wiki/Software/libinput/
 	arch = x86_64
 	license = custom:X11
@@ -14,9 +14,11 @@ pkgbase = lib32-libinput
 	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
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
 	sha512sums = 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924
 	sha512sums = SKIP
+	sha512sums = 8d603a04e1ef737f8627d75d2da97d5cee7607e2604a31105496a6ea2db632d40d04a567ce22ac2cd4765a2fd1ec4945032bad0b8c3b9ed4a9bd333886976570
 
 pkgname = lib32-libinput
 
diff --git a/0001_Elan_Touchpads_quirks.patch b/0001_Elan_Touchpads_quirks.patch
new file mode 100644
index 000000000000..69bbdef8c4c0
--- /dev/null
+++ b/0001_Elan_Touchpads_quirks.patch
@@ -0,0 +1,39 @@
+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 b5be20dfa384..316690480a1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _basename=libinput
 pkgname="lib32-$_basename"
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Input device management and event handling library (32-bit)"
 url="https://www.freedesktop.org/wiki/Software/libinput/"
 arch=(x86_64)
@@ -12,11 +12,19 @@ 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})
+source=(https://freedesktop.org/software/$_basename/$_basename-$pkgver.tar.xz{,.sig}
+        0001_Elan_Touchpads_quirks.patch)
 sha512sums=('4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924'
-            'SKIP')
+            'SKIP'
+            '8d603a04e1ef737f8627d75d2da97d5cee7607e2604a31105496a6ea2db632d40d04a567ce22ac2cd4765a2fd1ec4945032bad0b8c3b9ed4a9bd333886976570')
 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'
diff --git a/libinput.install b/libinput.install
deleted file mode 100644
index b9d5d0e9ba5b..000000000000
--- a/libinput.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  udevadm hwdb --update >/dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}