summaryrefslogtreecommitdiff
path: root/extra/xf86-input-evdev
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-03-20 00:01:23 +0000
committerroot <root@rshg054.dnsready.net>2012-03-20 00:01:23 +0000
commit99136e3a2e9f6f07a7ff08d5721bce354b853c8b (patch)
tree3cd677128a00bc9501f93e27e53ebba72f44cd52 /extra/xf86-input-evdev
parentde5b6982e42f4a1e8b0537cfbc1b676e2a81f195 (diff)
Tue Mar 20 00:01:23 UTC 2012
Diffstat (limited to 'extra/xf86-input-evdev')
-rw-r--r--extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff27
-rw-r--r--extra/xf86-input-evdev/PKGBUILD11
2 files changed, 34 insertions, 4 deletions
diff --git a/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff b/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
new file mode 100644
index 000000000..93c54d300
--- /dev/null
+++ b/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
@@ -0,0 +1,27 @@
+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/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index a0299099f..00cdc8bb8 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153303 2012-03-12 20:52:38Z andyrtr $
+# $Id: PKGBUILD 153700 2012-03-18 08:50:36Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <Alexander@archlinux.org
pkgname=xf86-input-evdev
pkgver=2.7.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.org evdev input driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ makedepends=('xorg-server-devel>=1.11.99.902')
conflicts=('xorg-server<1.11.99.902')
options=('!libtool' '!makeflags')
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ Fix_inverted_horizontal_scroll.diff)
+sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa'
+ 'e959e710d9a0c60a3af967148b9d5e014544993c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff
./configure --prefix=/usr
make
}