[arch-commits] Commit in xf86-input-evdev/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Sunday, March 18, 2012 @ 04:50:00
  Author: andyrtr
Revision: 153699

upgpkg: xf86-input-evdev 2.7.0-2

add patch to fix inverted horizontal mouse scrolling

Added:
  xf86-input-evdev/trunk/Fix_inverted_horizontal_scroll.diff
Modified:
  xf86-input-evdev/trunk/PKGBUILD

-------------------------------------+
 Fix_inverted_horizontal_scroll.diff |   27 +++++++++++++++++++++++++++
 PKGBUILD                            |    9 ++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

Added: Fix_inverted_horizontal_scroll.diff
===================================================================
--- Fix_inverted_horizontal_scroll.diff	                        (rev 0)
+++ Fix_inverted_horizontal_scroll.diff	2012-03-18 08:50:00 UTC (rev 153699)
@@ -0,0 +1,27 @@
+From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at 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 at who-t.net>
+Reviewed-by: Chase Douglas <chase.douglas at 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-18 08:03:56 UTC (rev 153698)
+++ PKGBUILD	2012-03-18 08:50:00 UTC (rev 153699)
@@ -4,7 +4,7 @@
 
 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 @@
 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
 }