Fix loading driver causing Xorg to crash because of RemoveEnabledDevice no longer existing

2 files changed, 34 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 229302019a31..260f2369137f 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 000000000000..e7801dbe69f2
--- /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);