[pkgsrc/trunk]: pkgsrc/x11/inputproto "Apparently pulling in Xmd.h here [XI.h...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5210cb739d7b
branches:  trunk
changeset: 545035:5210cb739d7b
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Thu Jul 24 17:30:14 2008 +0000

description:
"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.

diffstat:

 x11/inputproto/Makefile         |   3 ++-
 x11/inputproto/distinfo         |   3 ++-
 x11/inputproto/patches/patch-aa |  36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diffs (64 lines):

diff -r 90a8ffb5d116 -r 5210cb739d7b x11/inputproto/Makefile
--- a/x11/inputproto/Makefile   Thu Jul 24 17:15:09 2008 +0000
+++ b/x11/inputproto/Makefile   Thu Jul 24 17:30:14 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:14 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/24 17:30:14 bjs Exp $
 #
 
 DISTNAME=              inputproto-1.4.3
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 90a8ffb5d116 -r 5210cb739d7b x11/inputproto/distinfo
--- a/x11/inputproto/distinfo   Thu Jul 24 17:15:09 2008 +0000
+++ b/x11/inputproto/distinfo   Thu Jul 24 17:30:14 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/03/07 20:18:07 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/07/24 17:30:14 bjs Exp $
 
 SHA1 (inputproto-1.4.3.tar.bz2) = d583df60442615b030910a0791319c015175e4e9
 RMD160 (inputproto-1.4.3.tar.bz2) = c33958cfd561f1e28d82255d8b6d6da6d398cae2
 Size (inputproto-1.4.3.tar.bz2) = 54190 bytes
+SHA1 (patch-aa) = 16f889b7c96bc761f577c51e4d7c1bc4fd662d6e
diff -r 90a8ffb5d116 -r 5210cb739d7b x11/inputproto/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/inputproto/patches/patch-aa   Thu Jul 24 17:30:14 2008 +0000
@@ -0,0 +1,36 @@
+$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