Patches from Hans Rosenfeld to make gtkwave compilable with gcc4.

4 files changed, 43 insertions, 1 deletions

diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index ad26668b133..8792e9a0ac4 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/10/28 03:53:33 itohy Exp $
+$NetBSD: distinfo,v 1.6 2006/10/15 13:29:08 agc Exp $
 
 SHA1 (gtkwave-2.0.0pre5.tar.gz) = 03ad81b6c196f01fe9c0d93755965f5a91b7043d
 RMD160 (gtkwave-2.0.0pre5.tar.gz) = bf70e21895ec6d7ce081a98d09f72b3b70ff9446
@@ -10,3 +10,6 @@ SHA1 (patch-ad) = 3b583846580361fe7c89f94b15f6c1bf7a7c62e2
 SHA1 (patch-ae) = dcba5cd4d607365d43e03ee4f385287987ce52ce
 SHA1 (patch-af) = f423597f6948547886162a686667e43e52c8e3d2
 SHA1 (patch-ag) = 30e6bc918f13977535fb3223e034b40588ce10f0
+SHA1 (patch-ah) = 4f85b76dc937cbda1e41f801ebe9fbaac15c9f70
+SHA1 (patch-ai) = c747757290e55fe4d51bcb38bc794acd22c4ea99
+SHA1 (patch-aj) = 95f51301fcd9198344700dcd89396c8f3e73b50e
diff --git a/cad/gtkwave/patches/patch-ah b/cad/gtkwave/patches/patch-ah
new file mode 100644
index 00000000000..d248c34f103
--- /dev/null
+++ b/cad/gtkwave/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/10/15 13:29:08 agc Exp $
+
+--- src/currenttime.h.orig	2003-11-11 23:53:27.000000000 +0100
++++ src/currenttime.h	2006-10-15 14:42:19.000000000 +0200
+@@ -51,8 +51,6 @@
+ 
+ extern BlackoutRegion *blackout_regions;
+ 
+-extern gdouble page_divisor;    /* allows fractional page scrolls */
+-
+ extern int font_height_override; /* force fontheight to be larger */
+ 
+ extern char *fontname_signals, *fontname_waves;
diff --git a/cad/gtkwave/patches/patch-ai b/cad/gtkwave/patches/patch-ai
new file mode 100644
index 00000000000..36e17b210af
--- /dev/null
+++ b/cad/gtkwave/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/10/15 13:29:08 agc Exp $
+
+--- src/navigate.c.orig	2004-04-25 21:23:42.000000000 +0200
++++ src/navigate.c	2006-10-15 14:43:01.000000000 +0200
+@@ -41,7 +41,7 @@
+ 
+ static TimeType step_length = 0;
+ 
+-static gdouble page_divisor = (gdouble) 1.0;
++static gdouble page_divisor = (gdouble) 1.0; /* allows fractional page scrolls */
+ 
+ /* wave_calculate_zoom_for_span : calculate the zoom factor to show the span of
+ 	time from `from' to `to'. */
diff --git a/cad/gtkwave/patches/patch-aj b/cad/gtkwave/patches/patch-aj
new file mode 100644
index 00000000000..b0d2ab30cda
--- /dev/null
+++ b/cad/gtkwave/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2006/10/15 13:29:08 agc Exp $
+
+--- src/draw.h.orig	2003-11-09 23:21:33.000000000 +0100
++++ src/draw.h	2006-10-15 14:43:16.000000000 +0200
+@@ -32,8 +32,6 @@
+ #include "event.h"
+ #include "view.h"
+ 
+-extern GdkPixmap *wavepixmap;
+-
+ /* Destination device for drawing.  Used as indices into wave_drawing_functions */
+ typedef enum
+ {