Date: Friday, March 23, 2012 @ 16:25:34 Author: andyrtr Revision: 154163
upgpkg: xf86-input-synaptics 1.5.99.902-1 upstream update 1.5.99.902 Modified: xf86-input-synaptics/trunk/PKGBUILD Deleted: xf86-input-synaptics/trunk/synaptics-Fix-inverted-circular-scrolling-direction.patch -----------------------------------------------------------+ PKGBUILD | 13 +-- synaptics-Fix-inverted-circular-scrolling-direction.patch | 40 ------------ 2 files changed, 5 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-23 20:16:23 UTC (rev 154162) +++ PKGBUILD 2012-03-23 20:25:34 UTC (rev 154163) @@ -5,8 +5,8 @@ # Contributor: Alexander Baldeck <[email protected]> pkgname=xf86-input-synaptics -pkgver=1.5.99.901 -pkgrel=2 +pkgver=1.5.99.902 +pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64') license=('custom') @@ -21,15 +21,12 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf - synaptics-Fix-inverted-circular-scrolling-direction.patch) -sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0' - '68e1f4ef5e1038231d210eb422fa4d18c5922f0f' - '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb') + 10-synaptics.conf) +sha1sums=('2170854823caf39f15f47329514fdbe620e31e96' + '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch ./configure --prefix=/usr make } Deleted: synaptics-Fix-inverted-circular-scrolling-direction.patch =================================================================== --- synaptics-Fix-inverted-circular-scrolling-direction.patch 2012-03-23 20:16:23 UTC (rev 154162) +++ synaptics-Fix-inverted-circular-scrolling-direction.patch 2012-03-23 20:25:34 UTC (rev 154163) @@ -1,40 +0,0 @@ -From patchwork Wed Mar 14 03:27:29 2012 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [synaptics] Fix inverted circular scrolling direction -Date: Wed, 14 Mar 2012 03:27:29 -0000 -From: Peter Hutterer <[email protected]> -X-Patchwork-Id: 9512 -Message-Id: <[email protected]> -To: "X.Org Devel List" <[email protected]> -Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <[email protected]> - -Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10. -In said commit, the old-style button events were changed to delta -accumulation. Alas, for circular scrolling, a positive delta is up whereas -for everything else a positive delta is down. - -Reported-by: Thomas Bächler <[email protected]> -Signed-off-by: Peter Hutterer <[email protected]> - ---- -src/synaptics.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/synaptics.c b/src/synaptics.c -index fa46f0d..c9609cd 100644 ---- a/src/synaptics.c -+++ b/src/synaptics.c -@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, - double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); - if (delta >= 0.005 && diff != 0.0) { - if (priv->circ_scroll_vert) -- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; -+ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; - else -- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; -+ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;; - priv->scroll.last_a = angle(priv, hw->x, hw->y); - DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a); - }
