Sat Jun 5 12:29:53 2010 UTC ()
Fix build with latest X from xsrc. I hope it doesn't break anything else,
but I expect it... let me know if you can improve the patch.


(wiz)
diff -r1.33 -r1.34 pkgsrc/emulators/vice/distinfo
diff -r1.6 -r1.7 pkgsrc/emulators/vice/patches/patch-af
cvs diff -r1.33 -r1.34 pkgsrc/emulators/vice/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/vice/distinfo 2009/07/12 22:10:59 1.33
+++ pkgsrc/emulators/vice/distinfo 2010/06/05 12:29:53 1.34
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.33 2009/07/12 22:10:59 hasso Exp $ 1$NetBSD: distinfo,v 1.34 2010/06/05 12:29:53 wiz Exp $
2 2
3SHA1 (vice-1.22.tar.gz) = 55e0047824f64173539e03ddd2d5ab51cd581fbb 3SHA1 (vice-1.22.tar.gz) = 55e0047824f64173539e03ddd2d5ab51cd581fbb
4RMD160 (vice-1.22.tar.gz) = ca93fc424e617e38f27e288ebcdfbab2aa3659db 4RMD160 (vice-1.22.tar.gz) = ca93fc424e617e38f27e288ebcdfbab2aa3659db
5Size (vice-1.22.tar.gz) = 6088483 bytes 5Size (vice-1.22.tar.gz) = 6088483 bytes
6SHA1 (patch-aa) = 16bc2420025494bee1eb6ed64c7b746f001406f7 6SHA1 (patch-aa) = 16bc2420025494bee1eb6ed64c7b746f001406f7
7SHA1 (patch-ab) = 5c480e693b3ba16d36d740d1ba56c85553d2665b 7SHA1 (patch-ab) = 5c480e693b3ba16d36d740d1ba56c85553d2665b
8SHA1 (patch-af) = 524913b7bc753dafde909bb26ace8f0500be14d5 8SHA1 (patch-af) = c3300ce505dfd4c92c01503ab7dbfb84f9283cd8
cvs diff -r1.6 -r1.7 pkgsrc/emulators/vice/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/emulators/vice/patches/Attic/patch-af 2006/06/29 22:56:34 1.6
+++ pkgsrc/emulators/vice/patches/Attic/patch-af 2010/06/05 12:29:53 1.7
@@ -1,16 +1,26 @@ @@ -1,16 +1,26 @@
1$NetBSD: patch-af,v 1.6 2006/06/29 22:56:34 dillo Exp $ 1$NetBSD: patch-af,v 1.7 2010/06/05 12:29:53 wiz Exp $
2 2
3--- src/arch/unix/x11/video.c.orig 2006-01-02 01:04:55.000000000 +0100 3--- src/arch/unix/x11/video.c.orig 2007-08-04 13:24:43.000000000 +0000
4+++ src/arch/unix/x11/video.c 4+++ src/arch/unix/x11/video.c
5@@ -210,11 +210,7 @@ int video_init_cmdline_options(void) 5@@ -56,6 +56,9 @@
 6 #include <X11/Xutil.h>
 7 #include <X11/Intrinsic.h>
 8 #include <X11/cursorfont.h>
 9+#include <X11/extensions/Xxf86dga.h>
 10+#include <X11/Xmd.h>
 11+#include <X11/extensions/shmproto.h>
 12
 13 #include <stdio.h>
 14 #include <stdlib.h>
 15@@ -221,11 +224,7 @@ int video_init_cmdline_options(void)
6  16
7 /* ------------------------------------------------------------------------- */ 17 /* ------------------------------------------------------------------------- */
8  18
9-#if !defined(__NETBSD__) 19-#if !defined(__NETBSD__)
10 static GC _video_gc; 20 static GC _video_gc;
11-#else 21-#else
12-GC _video_gc; 22-GC _video_gc;
13-#endif 23-#endif
14 static void (*_refresh_func)(); 24 static void (*_refresh_func)();
15  25
16 /* This is set to 1 if the Shared Memory Extensions can actually be used. */ 26 /* This is set to 1 if the Shared Memory Extensions can actually be used. */