(#213052) Fix incompatibility with qt -- INT32 definition conflict.

(Portage version: 2.1.4.4)

4 files changed, 115 insertions, 1 deletions

diff --git a/x11-proto/inputproto/ChangeLog b/x11-proto/inputproto/ChangeLog
index 6cdf739737af..398d746677e7 100644
--- a/x11-proto/inputproto/ChangeLog
+++ b/x11-proto/inputproto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-proto/inputproto
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.62 2008/03/10 01:46:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.63 2008/03/12 03:50:27 dberkholz Exp $
+
+*inputproto-1.4.3-r1 (12 Mar 2008)
+
+  12 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch,
+  +files/0002-Typo-fix.patch, +inputproto-1.4.3-r1.ebuild:
+  (#213052) Fix incompatibility with qt -- INT32 definition conflict.
 
 *inputproto-1.4.3 (10 Mar 2008)
 
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
new file mode 100644
index 000000000000..6cde5cd9e622
--- /dev/null
+++ b/x11-proto/inputproto/files/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch
@@ -0,0 +1,62 @@
+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
new file mode 100644
index 000000000000..642b8d0a00ed
--- /dev/null
+++ b/x11-proto/inputproto/files/0002-Typo-fix.patch
@@ -0,0 +1,25 @@
+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
+
diff --git a/x11-proto/inputproto/inputproto-1.4.3-r1.ebuild b/x11-proto/inputproto/inputproto-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..0a00112f2e8b
--- /dev/null
+++ b/x11-proto/inputproto/inputproto-1.4.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-1.4.3-r1.ebuild,v 1.1 2008/03/12 03:50:27 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Input protocol headers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES="
+	${FILESDIR}/0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch
+	${FILESDIR}/0002-Typo-fix.patch
+	"