diff options
author | itohy <itohy@pkgsrc.org> | 2005-10-28 03:53:33 +0000 |
---|---|---|
committer | itohy <itohy@pkgsrc.org> | 2005-10-28 03:53:33 +0000 |
commit | 16d58465738628a244283b5ee955665907d4efa5 (patch) | |
tree | 38f6062d64dc0784c7dfc556bee34fd659b3b21f /cad/gtkwave/patches | |
parent | 02cf46c5eacc0ccdbcab17af69f484287002fd02 (diff) | |
download | pkgsrc-16d58465738628a244283b5ee955665907d4efa5.tar.gz |
Make this compile using gcc 2.95.
Diffstat (limited to 'cad/gtkwave/patches')
-rw-r--r-- | cad/gtkwave/patches/patch-ac | 17 | ||||
-rw-r--r-- | cad/gtkwave/patches/patch-ad | 21 | ||||
-rw-r--r-- | cad/gtkwave/patches/patch-ae | 15 | ||||
-rw-r--r-- | cad/gtkwave/patches/patch-af | 19 | ||||
-rw-r--r-- | cad/gtkwave/patches/patch-ag | 21 |
5 files changed, 93 insertions, 0 deletions
diff --git a/cad/gtkwave/patches/patch-ac b/cad/gtkwave/patches/patch-ac new file mode 100644 index 00000000000..9c4a099bf60 --- /dev/null +++ b/cad/gtkwave/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.3 2005/10/28 03:53:34 itohy Exp $ + +--- src/format/data.h.orig Sun Sep 28 05:31:46 2003 ++++ src/format/data.h Fri Oct 28 11:17:57 2005 +@@ -50,7 +50,11 @@ + typedef struct + { + unsigned wordCount; +- unsigned words[]; /* Alloc more here to size `wordCount' */ ++ unsigned words[ ++#if defined(__GNUC__) && __GNUC__ <= 2 ++ 0 ++#endif ++ ]; /* Alloc more here to size `wordCount' */ + } + FormatData; + diff --git a/cad/gtkwave/patches/patch-ad b/cad/gtkwave/patches/patch-ad new file mode 100644 index 00000000000..a33e490ea73 --- /dev/null +++ b/cad/gtkwave/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1 2005/10/28 03:53:34 itohy Exp $ + +--- src/format/data.c.orig Fri Apr 2 11:36:14 2004 ++++ src/format/data.c Fri Oct 28 11:19:18 2005 +@@ -595,6 +595,7 @@ bool FormatDataEqual (FormatData *data1, + unsigned *longData; + unsigned shortLength; + unsigned longLength; ++ int i = 0; + + /* Sort the short and long data out, then compare upto the length of the + short data, then check the remainder of the long word to make sure it's 0 */ +@@ -610,8 +611,6 @@ bool FormatDataEqual (FormatData *data1, + shortLength = data2->wordCount; + longLength = data1->wordCount; + } +- +- int i = 0; + + while (i < shortLength && equal) + { diff --git a/cad/gtkwave/patches/patch-ae b/cad/gtkwave/patches/patch-ae new file mode 100644 index 00000000000..b7f14a8a7ab --- /dev/null +++ b/cad/gtkwave/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2005/10/28 03:53:34 itohy Exp $ + +--- src/format/external.c.orig Sun Nov 23 06:17:29 2003 ++++ src/format/external.c Fri Oct 28 11:21:00 2005 +@@ -518,8 +518,9 @@ Format FormatListExternalToInternal (con + /* Now expecting `"name" value' */ + if (*stringPtr == '\"') + { ++ char *endQuote; + stringPtr ++; +- char *endQuote = strchr (stringPtr, '\"'); ++ endQuote = strchr (stringPtr, '\"'); + + if (endQuote) + { diff --git a/cad/gtkwave/patches/patch-af b/cad/gtkwave/patches/patch-af new file mode 100644 index 00000000000..ce3eb1784da --- /dev/null +++ b/cad/gtkwave/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1 2005/10/28 03:53:34 itohy Exp $ + +--- src/hhh.c.orig Mon May 17 10:32:29 2004 ++++ src/hhh.c Fri Oct 28 11:22:34 2005 +@@ -647,12 +647,13 @@ static TimeType hhh_load_declarations (W + + Node *hhh_signal_key_find (WaveReader *reader ,const char *key) + { ++ Node *node; + int channel_num = atoi (key); + + if (channel_num <= 0 || channel_num > HHH_PRIVATE (reader, nodes_allocated_size)) + return NULL; + +- Node *node = HHH_PRIVATE (reader, nodes)[channel_num - 1]; ++ node = HHH_PRIVATE (reader, nodes)[channel_num - 1]; + + return node; + } diff --git a/cad/gtkwave/patches/patch-ag b/cad/gtkwave/patches/patch-ag new file mode 100644 index 00000000000..14d7a08d223 --- /dev/null +++ b/cad/gtkwave/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1 2005/10/28 03:53:34 itohy Exp $ + +--- src/tracepane.c.orig Mon Apr 26 04:23:42 2004 ++++ src/tracepane.c Fri Oct 28 12:26:37 2005 +@@ -750,6 +750,7 @@ static void draw_event_trace (WaveDrawin + TimeType tim; + int height = 1 + add_extensions (t, which) - which; + int top, bottom; ++ TimeType last_time; + + wave_drawing_context_set_trace (context, t); + +@@ -781,7 +782,7 @@ static void draw_event_trace (WaveDrawin + ytext = yu + (wavefont->ascent / 2); + + do_horizontal_grid_line (context, bottom - 2, window); +- TimeType last_time = -1; ++ last_time = -1; + + /* No events? don't bother to show anything */ + if (! event_iter->current) |