[pkgsrc/trunk]: pkgsrc/net/kdenetwork3 Use <X11/Xmd.h> to define CARD32 et al...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94ca46ca189f
branches:  trunk
changeset: 540202:94ca46ca189f
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Apr 01 22:50:24 2008 +0000

description:
Use <X11/Xmd.h> to define CARD32 et al so that local definition
doesn't clash if something else happens to pull in that include
file - as now happens with XI.h file in inputproto-1.4.3.
Should fix PR 38227.

diffstat:

 net/kdenetwork3/distinfo         |   4 ++--
 net/kdenetwork3/patches/patch-am |  19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r dcddedf572fe -r 94ca46ca189f net/kdenetwork3/distinfo
--- a/net/kdenetwork3/distinfo  Tue Apr 01 22:47:24 2008 +0000
+++ b/net/kdenetwork3/distinfo  Tue Apr 01 22:50:24 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2008/02/20 10:00:24 markd Exp $
+$NetBSD: distinfo,v 1.46 2008/04/01 22:50:24 markd Exp $
 
 SHA1 (kdenetwork-3.5.9.tar.bz2) = a4901468e94d3433468ebf1f2213b93b37496cca
 RMD160 (kdenetwork-3.5.9.tar.bz2) = 3df73e0cd2b628cb49d12da3af663288aebdfd71
@@ -10,5 +10,5 @@
 SHA1 (patch-ag) = 6fad1af3bd383c01f80b7fa4da64184ad7172bb3
 SHA1 (patch-ah) = f13a567b6be1bd04e9d50185bab995f1a8a4d231
 SHA1 (patch-ai) = 27ff86fa25381bcb05c321b4f54acc225e9b90dd
-SHA1 (patch-am) = 4499a932b118175c87ad540b56a265f2864d71e8
+SHA1 (patch-am) = 2fd6d410c532dbf1338bec0356dcaa225e914148
 SHA1 (patch-an) = 8a086d1fef4eb4f96380438a87fecfe76d147b04
diff -r dcddedf572fe -r 94ca46ca189f net/kdenetwork3/patches/patch-am
--- a/net/kdenetwork3/patches/patch-am  Tue Apr 01 22:47:24 2008 +0000
+++ b/net/kdenetwork3/patches/patch-am  Tue Apr 01 22:50:24 2008 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-am,v 1.4 2006/10/12 10:47:18 markd Exp $
+$NetBSD: patch-am,v 1.5 2008/04/01 22:50:24 markd Exp $
 
---- krfb/libvncserver/rfb.h.orig       2003-07-21 19:38:18.000000000 +1200
+--- krfb/libvncserver/rfb.h.orig       2005-09-10 20:20:13.000000000 +1200
 +++ krfb/libvncserver/rfb.h
-@@ -62,7 +62,7 @@ typedef unsigned long KeySym;
+@@ -38,9 +38,7 @@ extern "C"
+ #include "keysym.h"
+ 
+ /* TODO: this stuff has to go into autoconf */
+-typedef unsigned char CARD8;
+-typedef unsigned short CARD16;
+-typedef unsigned int CARD32;
++#include <X11/Xmd.h>
+ typedef CARD32 Pixel;
+ /* typedef CARD32 KeySym; */
+ #ifndef __osf__
+@@ -62,7 +60,7 @@ typedef unsigned long KeySym;
  
  #ifdef __linux__
  #include <endian.h>
@@ -11,7 +22,7 @@
  #include <sys/types.h>
  #include <machine/endian.h>
  #ifndef _BYTE_ORDER
-@@ -76,7 +76,7 @@
+@@ -76,7 +74,7 @@ typedef unsigned long KeySym;
  #if defined(__sparc)
    /* SPARC here (big endian) */
  #define _BYTE_ORDER 4321