Update to 2.9.2-1

* Update version numbers and fix patch for new upstream

3 files changed, 31 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83969140e1fa..6f001946787d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xf86-input-evdev-ahm
 	pkgdesc = X.org evdev input driver + at-home-modifier patch
-	pkgver = 2.9.1
+	pkgver = 2.9.2
 	pkgrel = 1
 	url = https://gitorious.org/at-home-modifier
 	install = ahm.install
@@ -16,18 +16,18 @@ pkgbase = xf86-input-evdev-ahm
 	depends = systemd
 	depends = mtdev
 	depends = libevdev
-	provides = xf86-input-evdev=2.9.1
+	provides = xf86-input-evdev=2.9.2
 	conflicts = xorg-server<1.16.0
 	conflicts = X-ABI-XINPUT_VERSION<21
 	conflicts = X-ABI-XINPUT_VERSION>=22
 	conflicts = xf86-input-evdev
 	options = !makeflags
-	source = http://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.9.1.tar.bz2
-	source = http://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.9.1.tar.bz2.sig
-	source = ahm-2.9.1.patch
-	sha256sums = 0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9
+	source = http://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
+	source = http://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.9.2.tar.bz2.sig
+	source = ahm-2.9.2.patch
+	sha256sums = 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec
 	sha256sums = SKIP
-	sha256sums = 9415bfff270a1117693e29eb61b02475fd43d8913e606cb57b456b97c292aa57
+	sha256sums = ad66def281b6f7b3a97e85e162b9f52bc906ff807de9893009801d8adeeb34be
 
 pkgname = xf86-input-evdev-ahm
 
diff --git a/PKGBUILD b/PKGBUILD
index 5e0a878c8e34..8e16ff9f6547 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _name=at-home-modifier
 pkgname=xf86-input-evdev-ahm
 _pkgname_orig=xf86-input-evdev
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 pkgdesc="X.org evdev input driver + at-home-modifier patch"
 arch=(i686 x86_64)
@@ -13,18 +13,19 @@ license=('custom')
 depends=('glibc' 'systemd' 'mtdev' 'libevdev')
 makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.16.0' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22' 'xf86-input-evdev')
-provides=('xf86-input-evdev=2.9.1')
+provides=('xf86-input-evdev=2.9.2')
 options=('!makeflags')
 groups=('xorg-drivers' 'xorg')
 install=ahm.install
-source=(${_url_orig}/releases/individual/driver/${_pkgname_orig}-${pkgver}.tar.bz2{,.sig} ahm-2.9.1.patch)
-sha256sums=('0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9'
+source=(${_url_orig}/releases/individual/driver/${_pkgname_orig}-${pkgver}.tar.bz2{,.sig} ahm-2.9.2.patch)
+sha256sums=('792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec'
             'SKIP'
-            '9415bfff270a1117693e29eb61b02475fd43d8913e606cb57b456b97c292aa57')
+            'ad66def281b6f7b3a97e85e162b9f52bc906ff807de9893009801d8adeeb34be')
+validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
 
 build() {
   cd ${_pkgname_orig}-${pkgver}
-  patch -p1 -i $srcdir/ahm-2.9.1.patch
+  patch -p1 -i $srcdir/ahm-2.9.2.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/ahm-2.9.1.patch b/ahm-2.9.2.patch
index 6700cfba1c9b..1c0d1fe9fe0b 100644
--- a/ahm-2.9.1.patch
+++ b/ahm-2.9.2.patch
@@ -1,6 +1,6 @@
-diff -aur xf86-input-evdev-2.9.1.orig/README xf86-input-evdev-2.9.1.patched/README
---- xf86-input-evdev-2.9.1.orig/README	2013-04-10 16:24:31.000000000 +1000
-+++ xf86-input-evdev-2.9.1.patched/README	2014-11-30 20:30:51.034799150 +1100
+diff -aur xf86-input-evdev-2.9.2.orig/README xf86-input-evdev-2.9.2.patched/README
+--- xf86-input-evdev-2.9.2.orig/README	2013-04-10 16:24:31.000000000 +1000
++++ xf86-input-evdev-2.9.2.patched/README	2015-03-27 23:50:15.425749448 +1100
 @@ -1,20 +1,680 @@
 -xf86-input-evdev - Generic Linux input driver for the Xorg X server
 +Welcome to "At Home Modifier" hack of xf86-input-evdev. The original
@@ -693,9 +693,9 @@ diff -aur xf86-input-evdev-2.9.1.orig/README xf86-input-evdev-2.9.1.patched/READ
 +License
 +=======
 +Distributed under MIT License; Same as Xorg.
-diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched/src/evdev.c
---- xf86-input-evdev-2.9.1.orig/src/evdev.c	2014-11-26 10:33:56.000000000 +1100
-+++ xf86-input-evdev-2.9.1.patched/src/evdev.c	2014-11-30 20:30:51.038132470 +1100
+diff -aur xf86-input-evdev-2.9.2.orig/src/evdev.c xf86-input-evdev-2.9.2.patched/src/evdev.c
+--- xf86-input-evdev-2.9.2.orig/src/evdev.c	2015-03-27 12:35:50.000000000 +1100
++++ xf86-input-evdev-2.9.2.patched/src/evdev.c	2015-03-27 23:50:15.429082767 +1100
 @@ -135,6 +135,8 @@
  static Atom prop_virtual;
  static Atom prop_scroll_dist;
@@ -1092,7 +1092,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
  }
  
  /**
-@@ -928,13 +1267,24 @@
+@@ -936,13 +1275,24 @@
  {
      int i;
      EvdevPtr pEvdev = pInfo->private;
@@ -1120,7 +1120,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
          case EV_QUEUE_BTN:
              if (Evdev3BEmuFilterEvent(pInfo,
                                        pEvdev->queue[i].detail.key,
-@@ -960,6 +1310,10 @@
+@@ -968,6 +1318,10 @@
  #endif
          }
      }
@@ -1131,7 +1131,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
  }
  
  /**
-@@ -1425,6 +1779,15 @@
+@@ -1459,6 +1813,15 @@
              }
          }
      }
@@ -1147,7 +1147,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
  #endif
  
      for (axis = ABS_X; axis < ABS_MT_SLOT; axis++) {
-@@ -1950,6 +2313,7 @@
+@@ -1984,6 +2347,7 @@
      xf86FlushInput(pInfo->fd);
      xf86AddEnabledDevice(pInfo);
      EvdevMBEmuOn(pInfo);
@@ -1155,7 +1155,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
      Evdev3BEmuOn(pInfo);
      pEvdev->flags |= EVDEV_INITIALIZED;
      device->public.on = TRUE;
-@@ -1976,11 +2340,11 @@
+@@ -2010,11 +2374,11 @@
          return EvdevOn(device);
  
      case DEVICE_OFF:
@@ -1172,7 +1172,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
          if (pInfo->fd != -1)
          {
              EvdevGrabDevice(pInfo, 0, 1);
-@@ -2572,6 +2936,8 @@
+@@ -2606,6 +2970,8 @@
  
      pEvdev->type_name = NULL;
  
@@ -1181,7 +1181,7 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
      return pEvdev;
  }
  
-@@ -2633,6 +2999,118 @@
+@@ -2667,6 +3033,118 @@
          EvdevDragLockPreInit(pInfo);
      }
  
@@ -1300,10 +1300,10 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.c xf86-input-evdev-2.9.1.patched
      return Success;
  
  error:
-Only in xf86-input-evdev-2.9.1.patched/src: evdev.c.orig
-diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.h xf86-input-evdev-2.9.1.patched/src/evdev.h
---- xf86-input-evdev-2.9.1.orig/src/evdev.h	2014-11-26 10:33:56.000000000 +1100
-+++ xf86-input-evdev-2.9.1.patched/src/evdev.h	2014-11-30 20:30:51.041465789 +1100
+Only in xf86-input-evdev-2.9.2.patched/src: evdev.c.orig
+diff -aur xf86-input-evdev-2.9.2.orig/src/evdev.h xf86-input-evdev-2.9.2.patched/src/evdev.h
+--- xf86-input-evdev-2.9.2.orig/src/evdev.h	2015-03-27 12:35:50.000000000 +1100
++++ xf86-input-evdev-2.9.2.patched/src/evdev.h	2015-03-27 23:50:15.429082767 +1100
 @@ -37,6 +37,7 @@
  
  #include <linux/input.h>
@@ -1373,4 +1373,3 @@ diff -aur xf86-input-evdev-2.9.1.orig/src/evdev.h xf86-input-evdev-2.9.1.patched
  void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value);
  void EvdevQueueProximityEvent(InputInfoPtr pInfo, int value);
  #ifdef MULTITOUCH
-Only in xf86-input-evdev-2.9.1.patched/src: evdev.h.orig