diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
| commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
| tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /testing/xf86-input-acecad | |
| parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
| parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'testing/xf86-input-acecad')
| -rw-r--r-- | testing/xf86-input-acecad/PKGBUILD | 34 | ||||
| -rw-r--r-- | testing/xf86-input-acecad/assign-local-private-after-allocating.patch | 24 |
2 files changed, 0 insertions, 58 deletions
diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD deleted file mode 100644 index d711418ad..000000000 --- a/testing/xf86-input-acecad/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168205 2012-10-06 20:05:59Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-acecad -pkgver=1.5.0 -pkgrel=5 -pkgdesc="X.Org acecad tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('sysfsutils') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -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}/" -} diff --git a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch b/testing/xf86-input-acecad/assign-local-private-after-allocating.patch deleted file mode 100644 index e3e635a6f..000000000 --- a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 |