From 1fb5fac6d55ca10656de9a75dee49f31e38c3ad4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 28 Nov 2012 10:18:18 -0600
Subject: xf86-input-evdev  2.7.3

---
 .../Fix_inverted_horizontal_scroll.diff            | 27 ----------------------
 abs/core/xf86-input-evdev/PKGBUILD                 | 17 ++++++--------
 2 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff

diff --git a/abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff b/abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
deleted file mode 100644
index 93c54d3..0000000
--- a/abs/core/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 15 Mar 2012 05:46:32 +0000
-Subject: Fix inverted horizontal scroll (#46205)
-
-REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
-
-X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/evdev.c b/src/evdev.c
-index d540b87..8cf630c 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-         else if (axis == REL_DIAL)
-             SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
-         else if (axis == REL_HWHEEL)
--            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
-+            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
- #endif
-     }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD
index 00cdc8b..daab499 100644
--- a/abs/core/xf86-input-evdev/PKGBUILD
+++ b/abs/core/xf86-input-evdev/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 153700 2012-03-18 08:50:36Z andyrtr $
+# $Id: PKGBUILD 168556 2012-10-13 11:43:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
-pkgver=2.7.0
+pkgver=2.7.3
 pkgrel=2
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
+depends=('glibc' 'systemd-tools' 'mtdev')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        Fix_inverted_horizontal_scroll.diff)
-sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa'
-          'e959e710d9a0c60a3af967148b9d5e014544993c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff
   ./configure --prefix=/usr
   make
 }
-- 
cgit v0.12

