[arch-commits] Commit in libinput/repos/extra-x86_64 (3 files)

[Andreas Radke]

    Date: Tuesday, September 18, 2018 @ 05:06:04
  Author: andyrtr
Revision: 334858

archrelease: copy trunk to extra-x86_64

Added:
  libinput/repos/extra-x86_64/0001_Elan_Touchpads_quirks.patch
    (from rev 334857, libinput/trunk/0001_Elan_Touchpads_quirks.patch)
  libinput/repos/extra-x86_64/PKGBUILD
    (from rev 334857, libinput/trunk/PKGBUILD)
Deleted:
  libinput/repos/extra-x86_64/PKGBUILD

----------------------------------+
 0001_Elan_Touchpads_quirks.patch |   39 ++++++++++++++++++
 PKGBUILD                         |   79 ++++++++++++++++++++-----------------
 2 files changed, 82 insertions(+), 36 deletions(-)

Copied: libinput/repos/extra-x86_64/0001_Elan_Touchpads_quirks.patch (from rev 334857, libinput/trunk/0001_Elan_Touchpads_quirks.patch)
===================================================================
--- 0001_Elan_Touchpads_quirks.patch	                        (rev 0)
+++ 0001_Elan_Touchpads_quirks.patch	2018-09-18 05:06:04 UTC (rev 334858)
@@ -0,0 +1,39 @@
+From dcfea54787a3efe1f1ab44eef998c2a7a723d80a Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at 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 at 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
+
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-18 05:05:51 UTC (rev 334857)
+++ PKGBUILD	2018-09-18 05:06:04 UTC (rev 334858)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot
-
-pkgname=libinput
-pkgver=1.12.0
-pkgrel=1
-pkgdesc="Input device management and event handling library"
-url="https://www.freedesktop.org/wiki/Software/libinput/"
-arch=(x86_64)
-license=(custom:X11)
-depends=('mtdev' 'systemd' 'libevdev' 'libwacom')
-# upstream doesn't recommend building docs
-makedepends=('gtk3' 'meson') # 'doxygen' 'graphviz' 'python-sphinx' 'python-recommonmark'
-optdepends=('gtk3: libinput debug-gui'
-            'python-pyudev: libinput measure'
-            'python-evdev: libinput measure')
-source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha512sums=('4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924'
-            'SKIP')
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
-
-build() {
-  arch-meson $pkgname-$pkgver build \
-    -Dudev-dir=/usr/lib/udev \
-    -Dtests=false \
-    -Ddocumentation=false
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-
-  install -Dvm644 $pkgname-$pkgver/COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: libinput/repos/extra-x86_64/PKGBUILD (from rev 334857, libinput/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-18 05:06:04 UTC (rev 334858)
@@ -0,0 +1,43 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot
+
+pkgname=libinput
+pkgver=1.12.0
+pkgrel=2
+pkgdesc="Input device management and event handling library"
+url="https://www.freedesktop.org/wiki/Software/libinput/"
+arch=(x86_64)
+license=(custom:X11)
+depends=('mtdev' 'systemd' 'libevdev' 'libwacom')
+# upstream doesn't recommend building docs
+makedepends=('gtk3' 'meson') # 'doxygen' 'graphviz' 'python-sphinx' 'python-recommonmark'
+optdepends=('gtk3: libinput debug-gui'
+            'python-pyudev: libinput measure'
+            'python-evdev: libinput measure')
+source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+       0001_Elan_Touchpads_quirks.patch)
+sha512sums=('4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924'
+            'SKIP'
+            '8d603a04e1ef737f8627d75d2da97d5cee7607e2604a31105496a6ea2db632d40d04a567ce22ac2cd4765a2fd1ec4945032bad0b8c3b9ed4a9bd333886976570')
+validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  # FS#60072
+  patch -Np1 -i ../0001_Elan_Touchpads_quirks.patch
+}
+
+build() {
+  arch-meson $pkgname-$pkgver build \
+    -Dudev-dir=/usr/lib/udev \
+    -Dtests=false \
+    -Ddocumentation=false
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+
+  install -Dvm644 $pkgname-$pkgver/COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}