Thu Jul 24 17:30:14 2008 UTC ()
"Apparently pulling in Xmd.h here [XI.h] breaks qt, since they both
define an INT32 type (and incompatible ones even, since Xmd's is
unsigned long on ILP32." (from GIT)

Bump PKGREVISION.


(bjs)
diff -r1.7 -r1.8 pkgsrc/x11/inputproto/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/inputproto/distinfo
diff -r0 -r1.1 pkgsrc/x11/inputproto/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/x11/inputproto/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/inputproto/Attic/Makefile 2008/05/24 21:45:14 1.7
+++ pkgsrc/x11/inputproto/Attic/Makefile 2008/07/24 17:30:14 1.8
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:14 tnn Exp $ 1# $NetBSD: Makefile,v 1.8 2008/07/24 17:30:14 bjs Exp $
2# 2#
3 3
4DISTNAME= inputproto-1.4.3 4DISTNAME= inputproto-1.4.3
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=proto/} 7MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Input extension headers from X.org 12COMMENT= Input extension headers from X.org
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15CONFLICTS+= xextensions-[0-9]* 16CONFLICTS+= xextensions-[0-9]*
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.6 -r1.7 pkgsrc/x11/inputproto/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/inputproto/Attic/distinfo 2008/03/07 20:18:07 1.6
+++ pkgsrc/x11/inputproto/Attic/distinfo 2008/07/24 17:30:14 1.7
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.6 2008/03/07 20:18:07 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2008/07/24 17:30:14 bjs Exp $
2 2
3SHA1 (inputproto-1.4.3.tar.bz2) = d583df60442615b030910a0791319c015175e4e9 3SHA1 (inputproto-1.4.3.tar.bz2) = d583df60442615b030910a0791319c015175e4e9
4RMD160 (inputproto-1.4.3.tar.bz2) = c33958cfd561f1e28d82255d8b6d6da6d398cae2 4RMD160 (inputproto-1.4.3.tar.bz2) = c33958cfd561f1e28d82255d8b6d6da6d398cae2
5Size (inputproto-1.4.3.tar.bz2) = 54190 bytes 5Size (inputproto-1.4.3.tar.bz2) = 54190 bytes
 6SHA1 (patch-aa) = 16f889b7c96bc761f577c51e4d7c1bc4fd662d6e
File Added: pkgsrc/x11/inputproto/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2008/07/24 17:30:14 bjs Exp $

"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." (from GIT)

--- XI.h.orig	2008-03-05 22:05:38.000000000 -0500
+++ XI.h
@@ -52,8 +52,6 @@ SOFTWARE.
 #ifndef _XI_H_
 #define _XI_H_
 
-#include <X11/Xmd.h> /* CARD32 */
-
 #define sz_xGetExtensionVersionReq		8
 #define sz_xGetExtensionVersionReply		32
 #define sz_xListInputDevicesReq			4
@@ -263,12 +261,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