From b79408ae7429f4e5c99582cb55127b6e86b7fdac Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 12 Oct 2011 23:14:40 +0000
Subject: Wed Oct 12 23:14:40 UTC 2011

---
 extra/xf86-input-acecad/PKGBUILD                   | 15 ++++++++------
 .../assign-local-private-after-allocating.patch    | 24 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 extra/xf86-input-acecad/assign-local-private-after-allocating.patch

(limited to 'extra/xf86-input-acecad')

diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 9ec6a2995..49eb109fe 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 123257 2011-05-09 13:44:31Z jgc $
+# $Id: PKGBUILD 140352 2011-10-11 21:29:41Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-acecad
 pkgver=1.5.0
-pkgrel=1
+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')
-conflicts=('xorg-server<1.10.0')
+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)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1')
+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
 }
diff --git a/extra/xf86-input-acecad/assign-local-private-after-allocating.patch b/extra/xf86-input-acecad/assign-local-private-after-allocating.patch
new file mode 100644
index 000000000..e3e635a6f
--- /dev/null
+++ b/extra/xf86-input-acecad/assign-local-private-after-allocating.patch
@@ -0,0 +1,24 @@
+From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@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@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
-- 
cgit v1.2.3-54-g00ecf