[gtkwave] Update to 3.3.11

[Paul Howarth]

commit 56536fba8bbfe6b05e7a8bc0181c2d5452fb264d
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Aug 18 14:30:47 2010 +0100

    Update to 3.3.11
    
    - New upstream release 3.3.11
      - new tcl function: gtkwave::installFileFilter
      - new tcl function: gtkwave::installProcFilter
      - new tcl function: gtkwave::installTransFilter
      - new tcl function: gtkwave::setCurrentTranslateFile
      - new tcl function: gtkwave::setCurrentTranslateProc
      - new tcl function: gtkwave::setCurrentTranslateTransProc
      - new tcl function: gtkwave::setCurrentTranslateEnums
      - nested `ifdef fix for Vermin
      - fix for free to non-malloc'd address problem in repscripts
      - start to build a framework to support Tcl variable change callbacks
      - fix for 0 millisecond Tcl timer causing 100% CPU usage
      - add CVS versus ModelSim compatibility fixes for Bluespec savefiles
      - fix atoi_64 in presence of some garbage non-numerics
    - Add patch to fix building without Tcl
    - Explicitly disable Tcl where it won't build

 .gitignore                 |    2 +-
 gtkwave-3.3.11-notcl.patch |   39 +++++++++++++++++++++++++++++++++++++++
 gtkwave.spec               |   30 ++++++++++++++++++++++++++++--
 sources                    |    2 +-
 4 files changed, 69 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6610e4c..7f7aee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-gtkwave-3.3.10.tar.gz
+gtkwave-3.3.11.tar.gz
 gtkwave-48.png
 gtkwave-32.png
 gtkwave-16.png
diff --git a/gtkwave-3.3.11-notcl.patch b/gtkwave-3.3.11-notcl.patch
new file mode 100644
index 0000000..9dba5ce
--- /dev/null
+++ b/gtkwave-3.3.11-notcl.patch
@@ -0,0 +1,39 @@
+--- gtkwave-3.3.11/src/tcl_callbacks.h	2010-08-03 02:37:26.000000000 +0100
++++ gtkwave-3.3.11/src/tcl_callbacks.h	2010-08-18 10:36:10.518468151 +0100
+@@ -20,18 +20,19 @@
+ 
+ #define WAVE_TCL_LIST_ELEMENT			(TCL_LIST_ELEMENT)
+ #define WAVE_TCL_APPEND_VALUE			(TCL_APPEND_VALUE)
++#define WAVE_TCLCB_FLAGS_NONE			(WAVE_TCL_LIST_ELEMENT|TCL_GLOBAL_ONLY)
++#define WAVE_TCLCB_FLAGS_APPEND			(WAVE_TCL_LIST_ELEMENT|TCL_GLOBAL_ONLY|TCL_APPEND_VALUE)
+ 
+ #else
+ 
+ #define WAVE_TCL_LIST_ELEMENT			(0)
+ #define WAVE_TCL_APPEND_VALUE			(0)
++#define WAVE_TCLCB_FLAGS_NONE			(0)
++#define WAVE_TCLCB_FLAGS_APPEND			(0)
+ 
+ #endif
+ 
+ 
+-#define WAVE_TCLCB_FLAGS_NONE			(WAVE_TCL_LIST_ELEMENT|TCL_GLOBAL_ONLY)
+-#define WAVE_TCLCB_FLAGS_APPEND			(WAVE_TCL_LIST_ELEMENT|TCL_GLOBAL_ONLY|TCL_APPEND_VALUE)
+-
+ /* ################################################################ */
+ 
+ #define WAVE_TCLCB_ERROR			"gtkwave::cbError"
+--- gtkwave-3.3.11/src/tcl_helper.c	2010-08-02 18:27:04.000000000 +0100
++++ gtkwave-3.3.11/src/tcl_helper.c	2010-08-18 10:55:50.012374823 +0100
+@@ -2884,6 +2884,11 @@
+ return(NULL);
+ }
+ 
++const char *gtkwavetcl_setvar_nonblocking(const char *name1, const char *val, int flags)
++{
++return(NULL);
++}
++
+ #endif
+ 
+ 
diff --git a/gtkwave.spec b/gtkwave.spec
index 0e32888..9a83bd9 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -5,7 +5,7 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.3.10
+Version:	3.3.11
 Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
@@ -15,6 +15,7 @@ Source1:	gtkwave.desktop
 Source2:	gtkwave-16.png
 Source3:	gtkwave-32.png
 Source4:	gtkwave-48.png
+Patch0:		gtkwave-3.3.11-notcl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, bzip2-devel, Judy-devel, xz-devel, zlib-devel
 BuildRequires:	gperf, flex, desktop-file-utils
@@ -35,8 +36,15 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
+# Support building without Tcl if necessary
+%patch0 -p1
+
 %build
-%{configure} --disable-dependency-tracking --enable-judy
+%{configure} --disable-dependency-tracking \
+%if 0%{?fedora} < 2 && 0%{?rhel} < 4
+	--disable-tcl \
+%endif
+	--enable-judy
 %{__make} %{?_smp_mflags}
 
 %install
@@ -126,6 +134,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Aug 18 2010 Paul Howarth <paul at city-fan.org> 3.3.11-1
+- update to 3.3.11
+  - new tcl function: gtkwave::installFileFilter
+  - new tcl function: gtkwave::installProcFilter
+  - new tcl function: gtkwave::installTransFilter
+  - new tcl function: gtkwave::setCurrentTranslateFile
+  - new tcl function: gtkwave::setCurrentTranslateProc
+  - new tcl function: gtkwave::setCurrentTranslateTransProc
+  - new tcl function: gtkwave::setCurrentTranslateEnums
+  - nested `ifdef fix for Vermin
+  - fix for free to non-malloc'd address problem in repscripts
+  - start to build a framework to support Tcl variable change callbacks
+  - fix for 0 millisecond Tcl timer causing 100% CPU usage
+  - add CVS versus ModelSim compatibility fixes for Bluespec savefiles
+  - fix atoi_64 in presence of some garbage non-numerics
+- add patch to fix building without Tcl
+- explicitly disable Tcl where it won't build
+
 * Sun Jul 18 2010 Paul Howarth <paul at city-fan.org> 3.3.10-1
 - update to 3.3.10
   - parallel build fix
diff --git a/sources b/sources
index df14794..27c3162 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-4e5e0a14ca52463fdbc4b69a47b87c6a  gtkwave-3.3.10.tar.gz
+9ebbb90b673a4006ce64ecda86baa76f  gtkwave-3.3.11.tar.gz
 4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png
 410c50539074403d3a3240f7c9209b11  gtkwave-32.png
 2cc7754492918591242bc38a0b11d2a5  gtkwave-16.png