Drop stale patches.

(Portage version: 2.2_rc51/cvs/Linux x86_64)

3 files changed, 6 insertions, 88 deletions

diff --git a/x11-proto/inputproto/ChangeLog b/x11-proto/inputproto/ChangeLog
index 627ac5501eab..9b0d0f6f492a 100644
--- a/x11-proto/inputproto/ChangeLog
+++ b/x11-proto/inputproto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-proto/inputproto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.87 2009/10/26 20:43:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.88 2009/11/22 23:50:30 scarabeus Exp $
+
+  22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch,
+  -files/0002-Typo-fix.patch:
+  Drop stale patches.
 
   26 Oct 2009; Jeroen Roovers <jer@gentoo.org> inputproto-1.5.1.ebuild:
   Stable for HPPA (bug #282290).
diff --git a/x11-proto/inputproto/files/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch b/x11-proto/inputproto/files/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch
deleted file mode 100644
index 6cde5cd9e622..000000000000
--- a/x11-proto/inputproto/files/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10 Mar 2008 09:08:21 -0400
-Subject: [PATCH] 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).
----
- XI.h |   15 ++++++---------
- 1 files changed, 6 insertions(+), 9 deletions(-)
-
-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
--- 
-1.5.4.3
-
diff --git a/x11-proto/inputproto/files/0002-Typo-fix.patch b/x11-proto/inputproto/files/0002-Typo-fix.patch
deleted file mode 100644
index 642b8d0a00ed..000000000000
--- a/x11-proto/inputproto/files/0002-Typo-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 852568991b251e9366da167f1b746a0a1db6adf0 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10 Mar 2008 09:31:51 -0400
-Subject: [PATCH] Typo fix.
-
----
- XI.h |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-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
--- 
-1.5.4.3
-