diff options
| author | bjs <bjs> | 2008-07-24 17:30:14 +0000 |
|---|---|---|
| committer | bjs <bjs> | 2008-07-24 17:30:14 +0000 |
| commit | c2f7a15295a3a667e74ba626d868785a44f5f172 (patch) | |
| tree | 75a16c9441dee608fd79cb8da08be362936f8fe7 /x11 | |
| parent | 623df983abff3312e5e70fee19a952caa7b0242c (diff) | |
| download | pkgsrc-c2f7a15295a3a667e74ba626d868785a44f5f172.tar.gz | |
"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 (limited to 'x11')
| -rw-r--r-- | x11/inputproto/Makefile | 3 | ||||
| -rw-r--r-- | x11/inputproto/distinfo | 3 | ||||
| -rw-r--r-- | x11/inputproto/patches/patch-aa | 36 |
3 files changed, 40 insertions, 2 deletions
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile index 9fb988e9cfd..5862171f21a 100644 --- a/x11/inputproto/Makefile +++ b/x11/inputproto/Makefile @@ -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 --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo index 9652e3a367a..f12a44fc49e 100644 --- a/x11/inputproto/distinfo +++ b/x11/inputproto/distinfo @@ -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 --git a/x11/inputproto/patches/patch-aa b/x11/inputproto/patches/patch-aa new file mode 100644 index 00000000000..4a2695527f2 --- /dev/null +++ b/x11/inputproto/patches/patch-aa @@ -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 |