"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.diff -r1.7 -r1.8 pkgsrc/x11/inputproto/Makefile
(bjs)
@@ -1,21 +1,22 @@ | @@ -1,21 +1,22 @@ | |||
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 | |||
4 | DISTNAME= inputproto-1.4.3 | 4 | DISTNAME= inputproto-1.4.3 | |
5 | PKGREVISION= 1 | |||
5 | CATEGORIES= x11 | 6 | CATEGORIES= x11 | |
6 | MASTER_SITES= ${MASTER_SITE_XORG:=proto/} | 7 | MASTER_SITES= ${MASTER_SITE_XORG:=proto/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
8 | 9 | |||
9 | MAINTAINER= joerg@NetBSD.org | 10 | MAINTAINER= joerg@NetBSD.org | |
10 | HOMEPAGE= http://xorg.freedesktop.org/ | 11 | HOMEPAGE= http://xorg.freedesktop.org/ | |
11 | COMMENT= Input extension headers from X.org | 12 | COMMENT= Input extension headers from X.org | |
12 | 13 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
14 | 15 | |||
15 | CONFLICTS+= xextensions-[0-9]* | 16 | CONFLICTS+= xextensions-[0-9]* | |
16 | 17 | |||
17 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
18 | PKGCONFIG_OVERRIDE+= inputproto.pc.in | 19 | PKGCONFIG_OVERRIDE+= inputproto.pc.in | |
19 | USE_LANGUAGES= # empty | 20 | USE_LANGUAGES= # empty | |
20 | 21 | |||
21 | .include "../../mk/bsd.pkg.mk" | 22 | .include "../../mk/bsd.pkg.mk" |
@@ -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 | |||
3 | SHA1 (inputproto-1.4.3.tar.bz2) = d583df60442615b030910a0791319c015175e4e9 | 3 | SHA1 (inputproto-1.4.3.tar.bz2) = d583df60442615b030910a0791319c015175e4e9 | |
4 | RMD160 (inputproto-1.4.3.tar.bz2) = c33958cfd561f1e28d82255d8b6d6da6d398cae2 | 4 | RMD160 (inputproto-1.4.3.tar.bz2) = c33958cfd561f1e28d82255d8b6d6da6d398cae2 | |
5 | Size (inputproto-1.4.3.tar.bz2) = 54190 bytes | 5 | Size (inputproto-1.4.3.tar.bz2) = 54190 bytes | |
6 | SHA1 (patch-aa) = 16f889b7c96bc761f577c51e4d7c1bc4fd662d6e |
$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