[arch-commits] CVS update of extra/system/synaptics (PKGBUILD xinerama-fix.patch)

Tobias Powalowski tpowa at archlinux.org
Sun Jan 27 09:25:39 UTC 2008


    Date: Sunday, January 27, 2008 @ 04:25:39
  Author: tpowa
    Path: /home/cvs-extra/extra/system/synaptics

   Added: xinerama-fix.patch (1.1)
Modified: PKGBUILD (1.19 -> 1.20)

'upgpkg: fix http://bugs.archlinux.org/task/8732'


--------------------+
 PKGBUILD           |   12 +++++++-----
 xinerama-fix.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)


Index: extra/system/synaptics/PKGBUILD
diff -u extra/system/synaptics/PKGBUILD:1.19 extra/system/synaptics/PKGBUILD:1.20
--- extra/system/synaptics/PKGBUILD:1.19	Sat Sep 22 14:08:37 2007
+++ extra/system/synaptics/PKGBUILD	Sun Jan 27 04:25:39 2008
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD,v 1.19 2007/09/22 18:08:37 alexander Exp $
+# $Id: PKGBUILD,v 1.20 2008/01/27 09:25:39 tpowa Exp $
 # Maintainer: Tobias Powalowski  <tpowa at archlinux.org>
 # Contributor: Thomas Bächler <thomas at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=synaptics
 pkgver=0.14.6.99
-pkgrel=1
+pkgrel=2
 pkgdesc="synaptics driver for notebook touchpads"
 arch=(i686 x86_64)
 url="http://w1.894.telia.com/~u89404340/touchpad/"
 depends=('libxext' 'libx11')
 makedepends=('pkgconfig' 'xorg-server')
 source=(http://w1.894.telia.com/~u89404340/touchpad/files/${pkgname}-0.14.6.tar.bz2 \
-        synaptics-0.14.6.99-git-master.patch)
+        synaptics-0.14.6.99-git-master.patch xinerama-fix.patch)
 install="synaptics.install"
 
 build() {
   cd ${startdir}/src/${pkgname}-0.14.6
   patch -Np1 -i ${startdir}/src/synaptics-0.14.6.99-git-master.patch || return 1
-  
+  # fix http://bugs.archlinux.org/task/8732
+  patch -Np0 -i ../xinerama-fix.patch || return 1
   # make synaptics play nice with pixman and it's -1
   sed -i -e 's:ALLINCLUDES = :ALLINCLUDES = -I/usr/include/pixman-1 :g' Makefile
 
@@ -27,4 +28,5 @@
        MANDIR=${startdir}/pkg/usr/man/ install
 }
 md5sums=('1102cd575045640a064ab6f9b1e391af'
-         '3a88281ace381f9e105a5ff2bdd706a7')
+         '3a88281ace381f9e105a5ff2bdd706a7'
+         '0cc00b308a79daab468ad8bd46496b4e')
Index: extra/system/synaptics/xinerama-fix.patch
diff -u /dev/null extra/system/synaptics/xinerama-fix.patch:1.1
--- /dev/null	Sun Jan 27 04:25:39 2008
+++ extra/system/synaptics/xinerama-fix.patch	Sun Jan 27 04:25:39 2008
@@ -0,0 +1,14 @@
+--- synaptics.c
++++ synaptics.c
+@@ -1740,10 +1740,10 @@ MouseProc(DeviceIntPtr device, int what)
+ 			    );
+     /* X valuator */
+-    xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
++    xf86InitValuatorAxisStruct(dev, 0, -1, -1, 1, 0, 1);
+     xf86InitValuatorDefaults(dev, 0);
+     /* Y valuator */
+-    xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
++    xf86InitValuatorAxisStruct(dev, 1, -1, -1, 1, 0, 1);
+     xf86InitValuatorDefaults(dev, 1);
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     xf86MotionHistoryAllocate(local);




More information about the arch-commits mailing list