[pkgsrc/trunk]: pkgsrc/cad/gtkwave Make this compile using gcc 2.95.

[itohy <itohy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cae01c499fea
branches:  trunk
changeset: 501752:cae01c499fea
user:      itohy <itohy%pkgsrc.org@localhost>
date:      Fri Oct 28 03:53:33 2005 +0000

description:
Make this compile using gcc 2.95.

diffstat:

 cad/gtkwave/distinfo         |   7 ++++++-
 cad/gtkwave/patches/patch-ac |  17 +++++++++++++++++
 cad/gtkwave/patches/patch-ad |  21 +++++++++++++++++++++
 cad/gtkwave/patches/patch-ae |  15 +++++++++++++++
 cad/gtkwave/patches/patch-af |  19 +++++++++++++++++++
 cad/gtkwave/patches/patch-ag |  21 +++++++++++++++++++++
 6 files changed, 99 insertions(+), 1 deletions(-)

diffs (130 lines):

diff -r 6fbe4cb817ff -r cae01c499fea cad/gtkwave/distinfo
--- a/cad/gtkwave/distinfo      Fri Oct 28 02:53:46 2005 +0000
+++ b/cad/gtkwave/distinfo      Fri Oct 28 03:53:33 2005 +0000
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.4 2005/08/22 12:25:00 cube Exp $
+$NetBSD: distinfo,v 1.5 2005/10/28 03:53:33 itohy Exp $
 
 SHA1 (gtkwave-2.0.0pre5.tar.gz) = 03ad81b6c196f01fe9c0d93755965f5a91b7043d
 RMD160 (gtkwave-2.0.0pre5.tar.gz) = bf70e21895ec6d7ce081a98d09f72b3b70ff9446
 Size (gtkwave-2.0.0pre5.tar.gz) = 720414 bytes
 SHA1 (patch-aa) = 8daee531dc540a8fa76b8dedb6f23edf883b7dd2
 SHA1 (patch-ab) = 28e9c5ace91f99335097df4f901ab90c73f196d7
+SHA1 (patch-ac) = 1be7a41e8918281e8129b461fb0b253985333de8
+SHA1 (patch-ad) = 3b583846580361fe7c89f94b15f6c1bf7a7c62e2
+SHA1 (patch-ae) = dcba5cd4d607365d43e03ee4f385287987ce52ce
+SHA1 (patch-af) = f423597f6948547886162a686667e43e52c8e3d2
+SHA1 (patch-ag) = 30e6bc918f13977535fb3223e034b40588ce10f0
diff -r 6fbe4cb817ff -r cae01c499fea cad/gtkwave/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gtkwave/patches/patch-ac      Fri Oct 28 03:53:33 2005 +0000
@@ -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 -r 6fbe4cb817ff -r cae01c499fea cad/gtkwave/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gtkwave/patches/patch-ad      Fri Oct 28 03:53:33 2005 +0000
@@ -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 -r 6fbe4cb817ff -r cae01c499fea cad/gtkwave/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gtkwave/patches/patch-ae      Fri Oct 28 03:53:33 2005 +0000
@@ -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 -r 6fbe4cb817ff -r cae01c499fea cad/gtkwave/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gtkwave/patches/patch-af      Fri Oct 28 03:53:33 2005 +0000
@@ -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 -r 6fbe4cb817ff -r cae01c499fea cad/gtkwave/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gtkwave/patches/patch-ag      Fri Oct 28 03:53:33 2005 +0000
@@ -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)