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

Package-Manager: portage-2.1.4.4

5 files changed, 122 insertions, 5 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/Manifest b/x11-proto/inputproto/Manifest
index 85fb7ba1c483..0ba38c33b483 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-C-sucks-define-XEventClass-in-terms-of-unsigned-int.patch 1957 RMD160 1afc2f5d68b432e3721ac22a8b42ee6822dca9e8 SHA1 88c0d07b502e1b6eacc291068cdd7ed3dae61ec4 SHA256 1daf751102f621f20f66e21d77a2c482a4c4671581211f81f6a9703ebeacb0bc
+AUX 0002-Typo-fix.patch 605 RMD160 fb2e8193ea0dc8e2a577d5f28a3897fecd5b0db3 SHA1 39b9a46d44591bdafc4438ea3c0d675f531108d0 SHA256 0b3e77913b2341c90db2d1ed509f2ea457629114bd527a94b1b3a70e4546d3f6
 DIST inputproto-1.4.2.1.tar.bz2 47663 RMD160 d3b8015450f0689449c16c0d5538df326a6d7d26 SHA1 b2023ff507fb72b1434d13d913e1f4f0ad3c02ed SHA256 9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed
 DIST inputproto-1.4.2.tar.bz2 45120 RMD160 685495a234990ff5924d69a74adf7b6200f7cde1 SHA1 db749d46dde0fa84ae68425b6a91470079559c02 SHA256 62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6
 DIST inputproto-1.4.3.tar.bz2 54190 RMD160 c33958cfd561f1e28d82255d8b6d6da6d398cae2 SHA1 d583df60442615b030910a0791319c015175e4e9 SHA256 627119ff21391314b88e5f34da837473151a54ab980d2f76d7f3c6bd3d560d4a
 EBUILD inputproto-1.4.2.1.ebuild 475 RMD160 7c9a2dad3c36c5838591562162e36a2d1297611a SHA1 ba263ca7c928ba9768a43e073f0c9be261ff08d8 SHA256 e016b11af94837368077a6dd9c647896de4ede88219b99df8a916c751e69d294
 EBUILD inputproto-1.4.2.ebuild 472 RMD160 6c56455299dfb46fec6a6d261befccf204ed042e SHA1 590d08039000b2757cc864a1d72d0b449c9d5763 SHA256 9834fd7243bacad1b3fe70608b59b88d4a522bd018f22a42c07a6fe85fb52f62
+EBUILD inputproto-1.4.3-r1.ebuild 613 RMD160 9a121543a054b427bfe27ad2f1437e1c1f25d2af SHA1 a048fa92737032109dead57465f8dda3b6438feb SHA256 013bd3c5958523215c02ea1e3296b118fa5227c0b9fa44883dd20ba92ac7c117
 EBUILD inputproto-1.4.3.ebuild 487 RMD160 03670c257bdb6a5ba0bfa3c8b1f00bdcdebcbae3 SHA1 2db3fbc93b39c036300f5c59a9cdab7ceddce1e4 SHA256 2c34ead1407675fabda22d85f437b61ba8f796b5ba96a85f7dada6c83f6c84d5
-MISC ChangeLog 7218 RMD160 27371ccfe816025d744a6e91f35f14fdc0465ee1 SHA1 da71fdf40af043fe283281b6586170c22ff6feef SHA256 099a16c8b8eca4c9036eb313ac4ff919704ca31891067c37abc8c6490c8802a6
+MISC ChangeLog 7512 RMD160 01065912e16a2b9de6a9cdca851ab13c54434755 SHA1 cb4f2ec59c8ac662a5884df8047cf0f6b49262bd SHA256 3e50d9da068b396aa0f2a70238e4b6e69bae788f5924529f73e461220c03d16b
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH1JMHXVaO67S1rtsRAgpHAKCwttyTjDO+++GjwTLV8xYLN/+wRQCfdZ27
-ir0YcZ4ICSIsveZ3GLxaa6A=
-=RjNU
+iD8DBQFH11MKXVaO67S1rtsRAugXAJwNAEgfjP76kuplJc4ncbZ04H0WOgCg/RKg
+dh9VBFJvNyOBULfH4YpNRMc=
+=ocwV
 -----END PGP SIGNATURE-----
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
+	"