diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-20 11:40:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-20 11:40:04 +0100 |
| commit | fa1021504c53eb066826883dab3918e432b93444 (patch) | |
| tree | 312e7333a30cb09f648a85ec1a78bfb151ade116 /extra/xf86-input-evdev | |
| parent | 65de768385d6ee97a2b45c807ab9955c642da7c0 (diff) | |
| parent | 99136e3a2e9f6f07a7ff08d5721bce354b853c8b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/freeimage/PKGBUILD
community/gummi/PKGBUILD
community/mfs/PKGBUILD
community/nzbget/PKGBUILD
community/openntpd/PKGBUILD
community/proj/PKGBUILD
community/yaws/PKGBUILD
gnome-unstable/totem-plparser/PKGBUILD
gnome-unstable/totem/PKGBUILD
multilib/lib32-libice/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcomposite/PKGBUILD
multilib/lib32-libxdmcp/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxinerama/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-libxss/PKGBUILD
multilib/lib32-libxtst/PKGBUILD
multilib/lib32-libxxf86vm/PKGBUILD
testing/bash/PKGBUILD
testing/bash/system.bashrc
Diffstat (limited to 'extra/xf86-input-evdev')
| -rw-r--r-- | extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff | 27 | ||||
| -rw-r--r-- | extra/xf86-input-evdev/PKGBUILD | 11 |
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 ed0d28da3..f8cfb55cf 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 'mips64el') 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 } |