Add a patch to work around the non-working partial vcd file reading

(disable it), and another one to use memory a bit more efficiently.
The program is now usable with VCD files larger than 10M.
Update to the latest snapshot to ease discussion with the author;
a notable change in this is improved LXT support.

5 files changed, 47 insertions, 17 deletions

diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 59ba468e76f..c845bfdc9dd 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/14 13:21:18 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/15 12:32:58 drochner Exp $
 #
 
-DISTNAME=		gtkwave-2.0.0pre3
+#DISTNAME=		gtkwave-2.0.0pre3
+DISTNAME=		gtkwave-2.0.0pre3-20030319
+PKGNAME=		gtkwave-2.0.0pre3.20030319
 CATEGORIES=		cad
-MASTER_SITES=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
+#MASTER_SITES=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
+MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/snapshots/
 
 MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo
index b808018cd5a..8914fa5aa48 100644
--- a/cad/gtkwave/distinfo
+++ b/cad/gtkwave/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/14 13:21:18 drochner Exp $
+$NetBSD: distinfo,v 1.2 2003/07/15 12:32:58 drochner Exp $
 
-SHA1 (gtkwave-2.0.0pre3.tar.gz) = 9a48f6ccd2285e555b9883cb43a548ea0bb9d0b9
-Size (gtkwave-2.0.0pre3.tar.gz) = 682020 bytes
-SHA1 (patch-aa) = 9b1c751931f27f507ad4b1a383cf7fde9ffb2bbd
+SHA1 (gtkwave-2.0.0pre3-20030319.tar.gz) = 1eed6d1fba08ab5f92df0ba3b67c44fd252661f1
+Size (gtkwave-2.0.0pre3-20030319.tar.gz) = 706605 bytes
+SHA1 (patch-aa) = 1257d680ff1c6d4c0370261cdd025e9a00ab9a3a
+SHA1 (patch-ab) = a7c78e231235c1c528019c6fd36e5737cf1735bc
+SHA1 (patch-ac) = 4140c2c0204836147122b1c1051e5f68b0a1bf1d
diff --git a/cad/gtkwave/patches/patch-aa b/cad/gtkwave/patches/patch-aa
index 7c83ff3e321..6652135f847 100644
--- a/cad/gtkwave/patches/patch-aa
+++ b/cad/gtkwave/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/14 13:21:18 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/15 12:32:59 drochner Exp $
 
---- src/Makefile.in.orig	2003-07-14 13:47:13.000000000 +0200
-+++ src/Makefile.in	2003-07-14 13:49:05.000000000 +0200
-@@ -119,7 +119,7 @@
- @readerprefix@vcd_la_LDFLAGS = -module
- 
- gtkwave_LDADD = config/libwaveconfig.a @GTK_LIBS@ @XML_LIBS@ @builtin_readers_las@
--gtkwave_LDFLAGS = -static
+--- src/Makefile.in.orig	2003-03-19 14:07:27.000000000 +0100
++++ src/Makefile.in	2003-07-14 17:24:23.000000000 +0200
+@@ -194,7 +194,7 @@
+ 	tracefile.$(OBJEXT) tracewindow.$(OBJEXT)
+ gtkwave_OBJECTS = $(am_gtkwave_OBJECTS)
+ gtkwave_DEPENDENCIES = config/libwaveconfig.a
+-gtkwave_LDFLAGS =
 +gtkwave_LDFLAGS = -export-dynamic
  
- gtkwave_SOURCES = \
- 	alloc.h \
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/cad/gtkwave/patches/patch-ab b/cad/gtkwave/patches/patch-ab
new file mode 100644
index 00000000000..f37783e51b4
--- /dev/null
+++ b/cad/gtkwave/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/07/15 12:32:59 drochner Exp $
+
+--- src/utils.c.orig	2003-07-14 21:12:05.000000000 +0200
++++ src/utils.c	2003-07-14 21:12:57.000000000 +0200
+@@ -186,7 +186,7 @@
+  * freed so this is OK...
+  */
+ #ifndef HISTENT_GRANULARITY
+-#define HISTENT_GRANULARITY 100
++#define HISTENT_GRANULARITY ((64*1024)/sizeof(HistEnt))
+ #endif
+ 
+ HistEnt *histent_calloc (void)
diff --git a/cad/gtkwave/patches/patch-ac b/cad/gtkwave/patches/patch-ac
new file mode 100644
index 00000000000..f2856122080
--- /dev/null
+++ b/cad/gtkwave/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2003/07/15 12:32:59 drochner Exp $
+
+--- src/vcd.c.orig	2003-07-15 14:04:59.000000000 +0200
++++ src/vcd.c	2003-07-15 14:16:09.000000000 +0200
+@@ -2174,6 +2174,7 @@
+     filecachesize = 0;
+ 
+     val_size = fsize - off;     /* get size of file and amount of reads */
++    wave_flags.load_whole_file = TRUE; /* XXX hack - partial reading does not work */
+     if (val_size < 10485760 || wave_flags.load_whole_file) /* Create Something in here for files that are not split */
+     {
+         wave_flags.load_whole_file = TRUE;