Update to 2.10.6-3

* Source updated patch from upstream
* This includes new_kernel.patch, so remove it from here
* Fix timestamps for build
* Install bundled example config to /etc/X11/xorg.conf.d, and track in backup
* Install README

3 files changed, 17 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9bc3952591d..a17bf5937fdb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xf86-input-evdev-ahm
 	pkgdesc = X.org evdev input driver + at-home-modifier patch
 	pkgver = 2.10.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://gitlab.com/at-home-modifier/at-home-modifier-evdev/wikis/home
 	arch = x86_64
 	groups = xorg-drivers
@@ -18,15 +18,14 @@ pkgbase = xf86-input-evdev-ahm
 	conflicts = X-ABI-XINPUT_VERSION>=25
 	conflicts = xf86-input-evdev
 	options = !makeflags
+	backup = etc/X11/xorg.conf.d
 	source = https://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 	source = https://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2.sig
-	source = https://gitlab.com/at-home-modifier/download/raw/master/patch/ahm-2.10.3.patch
-	source = new_kernel.patch
+	source = https://gitlab.com/at-home-modifier/download/raw/master/patch/ahm-2.10.6.patch
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
 	sha512sums = 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1
 	sha512sums = SKIP
-	sha512sums = 918f1ca0149053d5d2817df5a748a993bc0b557b88d3380d308a775e1fd180c18895d7ba77b455daf23a097544dc7a83970321d3811d0d93b0a8f2a12e63154a
-	sha512sums = 6d98d1eb16d72e8e3f922c40c043832032999b86979cd55ea38fdddd060ef4700a0c5d85cb99bbb7ab7481b2bee6524e3a1c9bcade61dae2e2ab3b22b4becfdd
+	sha512sums = d484a5ad6d20269b6036016b3975e9e7e035d8191dea0c335ad791a9bf41cdab5804dce95be3980fdfc854705a55af50c9ac0d7b56e626b23ed76cd86039a288
 
 pkgname = xf86-input-evdev-ahm
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e8d2eb7d486..f751a38a9b1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ _name=at-home-modifier
 pkgname=xf86-input-evdev-ahm
 _pkgname_orig=xf86-input-evdev
 pkgver=2.10.6
-_ahmver=2.10.3
-pkgrel=2
+_ahmver=2.10.6
+pkgrel=3
 pkgdesc='X.org evdev input driver + at-home-modifier patch'
 arch=(x86_64)
 url='https://gitlab.com/at-home-modifier/at-home-modifier-evdev/wikis/home'
@@ -17,23 +17,22 @@ depends=('libsystemd' 'mtdev' 'libevdev')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=24.1' 'xorgproto')
 provides=('xf86-input-evdev=2.10.6-1')
 conflicts=('xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<24.1' 'X-ABI-XINPUT_VERSION>=25' 'xf86-input-evdev')
+backup=('etc/X11/xorg.conf.d')
 options=('!makeflags')
 groups=('xorg-drivers')
 source=(${_url_orig}/releases/individual/driver/${_pkgname_orig}-${pkgver}.tar.bz2{,.sig}
-        https://gitlab.com/at-home-modifier/download/raw/master/patch/ahm-${_ahmver}.patch
-        new_kernel.patch)
+        https://gitlab.com/at-home-modifier/download/raw/master/patch/ahm-${_ahmver}.patch)
 sha512sums=('560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1'
             'SKIP'
-            '918f1ca0149053d5d2817df5a748a993bc0b557b88d3380d308a775e1fd180c18895d7ba77b455daf23a097544dc7a83970321d3811d0d93b0a8f2a12e63154a'
-            '6d98d1eb16d72e8e3f922c40c043832032999b86979cd55ea38fdddd060ef4700a0c5d85cb99bbb7ab7481b2bee6524e3a1c9bcade61dae2e2ab3b22b4becfdd')
+            'd484a5ad6d20269b6036016b3975e9e7e035d8191dea0c335ad791a9bf41cdab5804dce95be3980fdfc854705a55af50c9ac0d7b56e626b23ed76cd86039a288')
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
 
 prepare() {
   cd "${_pkgname_orig}-${pkgver}"
   # at-home-modifier patch
   patch -p1 -i "${srcdir}/ahm-${_ahmver}.patch"
-  # patch for newer kernels https://bbs.archlinux.org/viewtopic.php?pid=1891346#p1891346
-  patch -p1 -i "${srcdir}/new_kernel.patch"
+  # Update timestamps to prevent error https://stackoverflow.com/a/33279062
+  touch aclocal.m4 Makefile.in
 }
 
 build() {
@@ -47,4 +46,10 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  # After the release of ahm-2.10.6, I renamed README to README.adoc. (It's better in GitLab, the hosting site.) Maybe you want to put a future reminder in PKGBUILD.
+  install -m755 -d "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m644 README "${pkgdir}/usr/share/doc/${pkgname}/"
+  # Not sure what this means: "you can modify the following line in Makefile.am: dist_xorgconf_DATA = 10-evdev.conf"
+  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+  install -m644 80-ahm.conf "${pkgdir}/etc/X11/xorg.conf.d/"
 }
diff --git a/new_kernel.patch b/new_kernel.patch
deleted file mode 100644
index 8c4d39d51693..000000000000
--- a/new_kernel.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/evdev.c b/src/evdev.c
-index 650be6b..d53cef3 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -323,8 +323,14 @@ static int ahmTimedOutP(long int lastSec, long int lastUsec, struct input_event
-     return 0;
-   }
- 
--  if( (ev->time.tv_sec - lastSec) * 1000
--      + (ev->time.tv_usec - lastUsec) / 1000
-+  /* Seems like in newer kernels (>= 5.5), the timestamp of a key release
-+     is that of the press event */
-+
-+  struct timeval tv;
-+  gettimeofday(&tv, NULL);
-+
-+  if( (tv.tv_sec - lastSec) * 1000
-+      + (tv.tv_usec - lastUsec) / 1000
-       > timeOut){
-     return 1;
-   }else{