[arch-commits] Commit in xf86-input-acecad/repos (4 files)

[Jan de Groot]

    Date: Tuesday, October 11, 2011 @ 17:29:40
  Author: jgc
Revision: 140351

db-move: moved xf86-input-acecad from [testing] to [extra] (i686)

Added:
  xf86-input-acecad/repos/extra-i686/PKGBUILD
    (from rev 140271, xf86-input-acecad/repos/testing-i686/PKGBUILD)
  xf86-input-acecad/repos/extra-i686/assign-local-private-after-allocating.patch
    (from rev 140271, xf86-input-acecad/repos/testing-i686/assign-local-private-after-allocating.patch)
Deleted:
  xf86-input-acecad/repos/extra-i686/PKGBUILD
  xf86-input-acecad/repos/testing-i686/

---------------------------------------------+
 PKGBUILD                                    |   67 +++++++++++++-------------
 assign-local-private-after-allocating.patch |   24 +++++++++
 2 files changed, 59 insertions(+), 32 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-11 21:29:39 UTC (rev 140350)
+++ extra-i686/PKGBUILD	2011-10-11 21:29:40 UTC (rev 140351)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.10.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-input-acecad/repos/extra-i686/PKGBUILD (from rev 140271, xf86-input-acecad/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-11 21:29:40 UTC (rev 140351)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-input-acecad
+pkgver=1.5.0
+pkgrel=2
+pkgdesc="X.Org acecad tablet input driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('sysfsutils')
+makedepends=('xorg-server-devel>=1.10.99.902')
+conflicts=('xorg-server<1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        assign-local-private-after-allocating.patch)
+sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
+          '9301020b0ef3c6f2081e957481a88d2e187a7973')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-input-acecad/repos/extra-i686/assign-local-private-after-allocating.patch (from rev 140271, xf86-input-acecad/repos/testing-i686/assign-local-private-after-allocating.patch)
===================================================================
--- extra-i686/assign-local-private-after-allocating.patch	                        (rev 0)
+++ extra-i686/assign-local-private-after-allocating.patch	2011-10-11 21:29:40 UTC (rev 140351)
@@ -0,0 +1,24 @@
+From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Mon, 27 Jun 2011 03:13:54 +0000
+Subject: Assign local->private after allocating.
+
+It is detrimental to the user experience when the driver tries to derefernce
+null pointers.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/src/acecad.c b/src/acecad.c
+index ad6d793..604fe91 100644
+--- a/src/acecad.c
++++ b/src/acecad.c
+@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
+         return BadAlloc;
+ 
+     memset(priv, 0, sizeof(AceCadPrivateRec));
++    local->private = priv;
+ 
+     local->device_control = DeviceControl;
+ 
+--
+cgit v0.8.3-6-g21f6