Re: pkg/38227: kdenetwork 3.5.9 build failure

[Mark Davies <mark%mcs.vuw.ac.nz@localhost>]

The following reply was made to PR pkg/38227; it has been noted by GNATS.

From: Mark Davies <mark%mcs.vuw.ac.nz@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: "Steven M. Bellovin" <smb%cs.columbia.edu@localhost>
Subject: Re: pkg/38227: kdenetwork 3.5.9 build failure
Date: Tue, 1 Apr 2008 23:12:41 +1300

 --Boundary-00=_Zqg8HSxRaxjsjzJ
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On Tuesday 01 April 2008 20:15:04 Mark Davies wrote:
 >  Now to figure out how to deal with it.
 
 Please try this patch.
 
 --Boundary-00=_Zqg8HSxRaxjsjzJ
 Content-Type: text/x-diff;
   charset="iso-8859-1";
   name="foo"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
        filename="foo"
 
 Index: distinfo
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/net/kdenetwork3/distinfo,v
 retrieving revision 1.45
 diff -u -r1.45 distinfo
 --- distinfo   20 Feb 2008 10:00:24 -0000      1.45
 +++ distinfo   1 Apr 2008 09:55:37 -0000
 @@ -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
 Index: patches/patch-am
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/net/kdenetwork3/patches/patch-am,v
 retrieving revision 1.4
 diff -u -r1.4 patch-am
 --- patches/patch-am   12 Oct 2006 10:47:18 -0000      1.4
 +++ patches/patch-am   1 Apr 2008 09:54:37 -0000
 @@ -1,8 +1,19 @@
  $NetBSD: patch-am,v 1.4 2006/10/12 10:47:18 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
 
 --Boundary-00=_Zqg8HSxRaxjsjzJ--