xorg-inputproto: updated to 1.4.4.

3 files changed, 4 insertions, 87 deletions

diff --git a/xorg-inputproto/.md5sum b/xorg-inputproto/.md5sum
index 118bbf7e..6d245f2e 100644
--- a/xorg-inputproto/.md5sum
+++ b/xorg-inputproto/.md5sum
@@ -1,2 +1 @@
-a0f0d8cf6fbf0db8ba3937d0cc16138d  inputproto-1.4.3.tar.bz2
-0862fbd3d8d8aae810786587ac8a1970  xorg-inputproto.diff
+3a532379f226c34b36a5c585999f75e4  inputproto-1.4.4.tar.bz2
diff --git a/xorg-inputproto/Pkgfile b/xorg-inputproto/Pkgfile
index 730c3bb9..da295c02 100644
--- a/xorg-inputproto/Pkgfile
+++ b/xorg-inputproto/Pkgfile
@@ -3,16 +3,13 @@
 # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
 
 name=xorg-inputproto
-version=1.4.3
-release=3
-source=(http://xorg.freedesktop.org/releases/individual/proto/inputproto-$version.tar.bz2
-        $name.diff)
+version=1.4.4
+release=1
+source=(http://xorg.freedesktop.org/releases/individual/proto/inputproto-$version.tar.bz2)
 
 build() {
 	cd inputproto-$version
 
-	patch -Np1 -i $SRC/$name.diff
-
 	./configure --prefix=/usr
 
 	make
diff --git a/xorg-inputproto/xorg-inputproto.diff b/xorg-inputproto/xorg-inputproto.diff
deleted file mode 100644
index c6f93c4f..00000000
--- a/xorg-inputproto/xorg-inputproto.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-From b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10  Mar  2008  13:08:21  +0000
-Subject: C sucks: define XEventClass in terms of unsigned int, not CARD32.
-
-Apparently pulling in Xmd.h here breaks qt, since they both define an
-INT32 type (and incompatible ones even, since Xmd's is unsigned long on
-ILP32 because whoever wrote Xmd.h is a C novice).
----
-diff --git a/XI.h b/XI.h
-index fe4981a..ec9bee2 100644
---- a/XI.h
-+++ b/XI.h
-@@ -1,5 +1,3 @@
--/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
--
- /************************************************************
- 
- Copyright 1989, 1998  The Open Group
-@@ -45,17 +43,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
- 
- ********************************************************/
--/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */
- 
- /* Definitions used by the server, library and client */
- 
- #ifndef _XI_H_
- #define _XI_H_
- 
--#include <X11/Xmd.h> /* CARD32 */
--
--#define sz_xGetExtensionVersionReq		8
--#define sz_xGetExtensionVersionReply		32
- #define sz_xListInputDevicesReq			4
- #define sz_xListInputDevicesReply		32
- #define sz_xOpenDeviceReq			8
-@@ -263,12 +256,16 @@ SOFTWARE.
- #define XI_DeviceBusy	3
- #define XI_BadClass	4
- 
--/* Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
-+/*
-+ * Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
-  * definition of XEventClass since that would be a library interface change.
-  * See the top of X.h for more _XSERVER64 magic.
-+ *
-+ * But, don't actually use the CARD32 type.  We can't get it defined here
-+ * without polluting the namespace.
-  */
- #ifdef _XSERVER64
--typedef	CARD32		XEventClass;
-+typedef unsigned int	XEventClass;
- #else
- typedef	unsigned long	XEventClass;
- #endif
---
-cgit v0.7.2-37-g538c
-From 852568991b251e9366da167f1b746a0a1db6adf0 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10  Mar  2008  13:31:51  +0000
-Subject: Typo fix.
-
----
-diff --git a/XI.h b/XI.h
-index ec9bee2..3b11860 100644
---- a/XI.h
-+++ b/XI.h
-@@ -49,6 +49,8 @@ SOFTWARE.
- #ifndef _XI_H_
- #define _XI_H_
- 
-+#define sz_xGetExtensionVersionReq             8
-+#define sz_xGetExtensionVersionReply           32
- #define sz_xListInputDevicesReq			4
- #define sz_xListInputDevicesReply		32
- #define sz_xOpenDeviceReq			8
---
-cgit v0.7.2-37-g538c