diff --git a/xorg/xf86-input-acecad/git-fix-171d4c8d.patch b/xorg/xf86-input-acecad/git-fix-171d4c8d.patch deleted file mode 100644 index 0f233d176..000000000 --- a/xorg/xf86-input-acecad/git-fix-171d4c8d.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Giuseppe Bilotta -Date: Mon, 9 Jul 2007 09:03:00 +0000 (+0200) -Subject: Don't crash X when the tablet wasn't found. -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-acecad.git;a=commitdiff;h=171d4c8dc6136aa8c14aedd0ee107d6ba957de04 - -Don't crash X when the tablet wasn't found. - -X would crash when switching to console if the acecad module was loaded but the tablet had not been configured. - -Fix by properly freeing structures before returning NULL in PreInit() ---- - ---- a/src/acecad.c -+++ b/src/acecad.c -@@ -488,8 +488,12 @@ SetupProc_fail: - xf86CloseSerial (local->fd); - if ((priv) && (priv->buffer)) - XisbFree (priv->buffer); -- if (priv) -+ if (priv) { - xfree (priv); -+ if (local) -+ local->private = NULL; -+ } -+ xf86DeleteInput(local, 0); - return NULL; - } - diff --git a/xorg/xf86-input-acecad/git-fix-8bcc6d22.patch b/xorg/xf86-input-acecad/git-fix-8bcc6d22.patch deleted file mode 100644 index d7edcde4c..000000000 --- a/xorg/xf86-input-acecad/git-fix-8bcc6d22.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Alan Coopersmith -Date: Wed, 29 Aug 2007 00:31:54 +0000 (-0700) -Subject: Make compatible with new input ABI -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-acecad.git;a=commitdiff;h=8bcc6d22889cc40c6b7d1582f87d4b2a816167ab - -Make compatible with new input ABI ---- - ---- a/src/acecad.c -+++ b/src/acecad.c -@@ -70,6 +70,12 @@ - #endif - #endif - -+/* Previously found in xf86Xinput.h */ -+#ifdef DBG -+#undef DBG -+#endif -+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} -+ - /***************************************************************************** - * Local Headers - ****************************************************************************/ -@@ -349,7 +355,9 @@ AceCadPreInit(InputDriverPtr drv, IDevPt - local->name = dev->identifier; - local->type_name = "ACECAD Tablet"; - local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - local->motion_history_proc = xf86GetMotionEvents; -+#endif - local->control_proc = NULL; - local->close_proc = CloseProc; - local->switch_mode = NULL; diff --git a/xorg/xf86-input-acecad/xf86-input-acecad.desc b/xorg/xf86-input-acecad/xf86-input-acecad.desc index ddabe8d89..2715735b4 100644 --- a/xorg/xf86-input-acecad/xf86-input-acecad.desc +++ b/xorg/xf86-input-acecad/xf86-input-acecad.desc @@ -26,9 +26,9 @@ [L] OpenSource [S] Stable -[V] 1.2.0 +[V] 1.2.1 [P] X -----5---9 112.600 [O] . package/*/*/modular-x-conf.in -[D] 707033598 xf86-input-acecad-1.2.0.tar.bz2 http://xorg.freedesktop.org/releases/individual/driver/ +[D] 706228216 xf86-input-acecad-1.2.1.tar.bz2 http://xorg.freedesktop.org/releases/individual/driver/