pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/vice Fix a static/non-static conflict that p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/490a908b198c
branches:  trunk
changeset: 503348:490a908b198c
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Fri Nov 18 20:44:55 2005 +0000

description:
Fix a static/non-static conflict that prevented this from building
when using gcc 4.

diffstat:

 emulators/vice/distinfo         |   3 ++-
 emulators/vice/patches/patch-af |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r dd47fcb843a3 -r 490a908b198c emulators/vice/distinfo
--- a/emulators/vice/distinfo   Fri Nov 18 20:19:42 2005 +0000
+++ b/emulators/vice/distinfo   Fri Nov 18 20:44:55 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2005/02/23 18:49:21 agc Exp $
+$NetBSD: distinfo,v 1.19 2005/11/18 20:44:55 kristerw Exp $
 
 SHA1 (vice-1.16.tar.gz) = ec3780e66a97fc235e3ff04b334210945fa3750a
 RMD160 (vice-1.16.tar.gz) = dc3583bf1cf23930396d7dbc6c397b70c521843a
@@ -8,3 +8,4 @@
 SHA1 (patch-ac) = bb648b8dc668a12540eab9f1be6374aab8cda35a
 SHA1 (patch-ad) = 9f26a52a0f60658b147ad62a8cadc37ddd99fe04
 SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
+SHA1 (patch-af) = c7aef30587e36c6f83daab29f76528f49846aa22
diff -r dd47fcb843a3 -r 490a908b198c emulators/vice/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-af   Fri Nov 18 20:44:55 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.5 2005/11/18 20:44:55 kristerw Exp $
+
+--- src/arch/unix/x11/video.c.orig     2005-11-18 20:57:10.000000000 +0100
++++ src/arch/unix/x11/video.c  2005-11-18 20:57:47.000000000 +0100
+@@ -204,7 +204,7 @@
+ 
+ /* ------------------------------------------------------------------------- */
+ 
+-static GC _video_gc;
++GC _video_gc;
+ static void (*_refresh_func)();
+ 
+ /* This is set to 1 if the Shared Memory Extensions can actually be used. */



Home | Main Index | Thread Index | Old Index