Re: pkg/43811 (pkgsrc-2010Q2 - emulators/vice build (wrong patch))

[Matthew Mondor <mm_lists%pulsar-zone.net@localhost>]

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

From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/43811 (pkgsrc-2010Q2 - emulators/vice build (wrong patch))
Date: Sun, 5 Sep 2010 02:38:06 -0400

 It appears that the interface change will last.
 
 Does the following patch work with XOrg 7.5+ (-current NetBSD)?
 
 Index: distinfo
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/emulators/vice/distinfo,v
 retrieving revision 1.35
 diff -u -r1.35 distinfo
 --- distinfo   24 Jul 2010 09:44:57 -0000      1.35
 +++ distinfo   5 Sep 2010 06:21:43 -0000
 @@ -8,4 +8,4 @@
  Size (vice_2_2_netbsd.patch) = 4437 bytes
  SHA1 (patch-aa) = 08ac51c0674fde12ff0032a69f7c301464c1b408
  SHA1 (patch-ab) = 982424905a9fb8eb011d19b3ec649b5d7a01ca83
 -SHA1 (patch-ad) = 0ace2e00ed2f66c8669ec745b62118570187735a
 +SHA1 (patch-ad) = 17b64590d07d7e4431a50334cf57132c93863a22
 Index: patches/patch-ad
 ===================================================================
 RCS file: 
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/emulators/vice/patches/patch-ad,v
 retrieving revision 1.14
 diff -u -r1.14 patch-ad
 --- patches/patch-ad   24 Jul 2010 09:44:57 -0000      1.14
 +++ patches/patch-ad   5 Sep 2010 06:21:39 -0000
 @@ -1,15 +1,18 @@
 -$NetBSD: patch-ad,v 1.14 2010/07/24 09:44:57 wiz Exp $
 -
  Fix build with current X headers.
  
 ---- src/arch/unix/x11/xaw/x11video.c.orig     2009-10-21 16:46:45.000000000 
+0000
 -+++ src/arch/unix/x11/xaw/x11video.c
 -@@ -59,6 +59,8 @@
 - #include <X11/Xutil.h>
 - #include <X11/Intrinsic.h>
 - #include <X11/cursorfont.h>
 -+#include <X11/Xmd.h>
 -+#include <X11/extensions/shmproto.h>
 +--- ./src/arch/unix/x11/xaw/videoarch.h.orig  2009-10-21 12:46:45.000000000 
-0400
 ++++ ./src/arch/unix/x11/xaw/videoarch.h       2010-09-04 14:25:34.000000000 
-0400
 +@@ -38,9 +38,13 @@
   
 - #include <stdio.h>
 - #include <stdlib.h>
 + #include <X11/Xlib.h>
 + #include <X11/keysym.h>
 + 
 + #ifdef USE_MITSHM
 + #include <X11/extensions/XShm.h>
 ++#ifndef X_ShmAttach
 ++#include <X11/extensions/shmproto.h>
 ++#include <X11/Xmd.h>
 ++#endif
 + #include <sys/ipc.h>
 + #include <sys/shm.h>
 + #endif
 
 
 Or to make it cleaner, the new patch-ad to replace the old one:
 
 
 Fix build with current X headers.
 
 --- ./src/arch/unix/x11/xaw/videoarch.h.orig   2009-10-21 12:46:45.000000000 
-0400
 +++ ./src/arch/unix/x11/xaw/videoarch.h        2010-09-04 14:25:34.000000000 
-0400
 @@ -38,9 +38,13 @@
  
  #include <X11/Xlib.h>
  #include <X11/keysym.h>
  
  #ifdef USE_MITSHM
  #include <X11/extensions/XShm.h>
 +#ifndef X_ShmAttach
 +#include <X11/extensions/shmproto.h>
 +#include <X11/Xmd.h>
 +#endif
  #include <sys/ipc.h>
  #include <sys/shm.h>
  #endif
 
 
 This works on XOrg <7.5 here.
 
 Thanks,
 -- 
 Matt