summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo "ThePooN" Denizart2018-04-27 16:20:15 +0200
committerHugo "ThePooN" Denizart2018-04-27 16:24:12 +0200
commit9acb56ba62a46d1981fa148c1f7c7d9ea2500f17 (patch)
treef6eacd26d2c1ebd74b2126354a169e2e2623a6d1
parent2bfb57409b8e1f29265c9b89f62d0f6e8af923cb (diff)
downloadaur-9acb56ba62a46d1981fa148c1f7c7d9ea2500f17.tar.gz
Fix loading driver causing Xorg to crash because of RemoveEnabledDevice no longer existing
-rw-r--r--PKGBUILD7
-rw-r--r--xf86RemoveEnabledDevice.patch29
2 files changed, 34 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 229302019a3..260f2369137 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,13 +13,16 @@ makedepends=('xorg-server-devel')
conflicts=('wizardpen-driver wizardpen')
replaces=('wizardpen-driver wizardpen')
source=(https://launchpad.net/wizardpen/trunk/0.8/+download/${_realname}-${pkgver}.tar.bz2
- config.patch)
+ config.patch
+ xf86RemoveEnabledDevice.patch)
sha1sums=('82060c678dc241de83b2b7415b6ada619b94db36'
- '86ce045389f477d4bb5b3f89fe7bd26ebe80e6db')
+ '86ce045389f477d4bb5b3f89fe7bd26ebe80e6db'
+ '9bf16b62bc993294ff2a3818730ab8090a5dbfd2')
build() {
cd "$srcdir/$_realname-$pkgver"
patch -Np0 -i "$srcdir"/config.patch
+ patch -Np0 -i "$srcdir"/xf86RemoveEnabledDevice.patch
./autogen.sh --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
make
}
diff --git a/xf86RemoveEnabledDevice.patch b/xf86RemoveEnabledDevice.patch
new file mode 100644
index 00000000000..e7801dbe69f
--- /dev/null
+++ b/xf86RemoveEnabledDevice.patch
@@ -0,0 +1,29 @@
+--- src/wizardpen-orig.c 2011-05-03 03:28:23.000000000 +0200
++++ src/wizardpen.c 2018-04-27 16:07:52.257449224 +0200
+@@ -573,7 +573,7 @@
+
+ if (local->fd != -1)
+ {
+- RemoveEnabledDevice (local->fd);
++ xf86RemoveEnabledDevice (local);
+ if (priv->buffer)
+ {
+ XisbFree(priv->buffer);
+@@ -581,7 +581,7 @@
+ }
+ xf86CloseSerial(local->fd);
+ }
+- RemoveEnabledDevice (local->fd);
++ xf86RemoveEnabledDevice (local);
+ local->fd = -1;
+ return rc;
+
+@@ -679,7 +679,7 @@
+
+ if (local->fd != -1)
+ {
+- RemoveEnabledDevice (local->fd);
++ xf86RemoveEnabledDevice (local);
+ if (priv->buffer)
+ {
+ XisbFree(priv->buffer);