[gtkwave] Update to 3.3.27

[Paul Howarth]

commit e43b83869ddec2098fb969c644437c4f9f5b7e87
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Oct 25 13:43:08 2011 +0100

    Update to 3.3.27
    
    - New upstream release 3.3.27
      - fixes of suspicious NULL pointer warnings from scan-build
      - fixed inline function linker errors when using Clang
      - optimization of more [1] cases found in analyzer.h when
        -DWAVE_USE_STRUCT_PACKING is active
      - in process_url_list(), use g_malloc/g_free as context can or will change
        when files are loaded
      - added fix for DnD crash when Quartz is the GDK back-end on Mac OSX
      - fixed fstWriterFlushContext() such that invocations outside the fstapi are
        synced with time changes
      - modify main window size for twinwave on Quartz: GtkPlug window does not
        fit into GtkSocket as with X11
    - Add patch to fix up glib2 header file inclusion

 gtkwave-3.3.27-glib-includes.patch |   30 ++++++++++++++++++++++++++++++
 gtkwave.spec                       |   21 ++++++++++++++++++++-
 sources                            |    2 +-
 3 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/gtkwave-3.3.27-glib-includes.patch b/gtkwave-3.3.27-glib-includes.patch
new file mode 100644
index 0000000..45e88ed
--- /dev/null
+++ b/gtkwave-3.3.27-glib-includes.patch
@@ -0,0 +1,30 @@
+With glib2 2.31:
+
+In file included from tcl_helper.c:15:0:
+/usr/include/glib-2.0/glib/gconvert.h:28:2: error: #error "Only <glib.h> can be included directly."
+
+In file included from tcl_commands.c:15:0:
+/usr/include/glib-2.0/glib/gconvert.h:28:2: error: #error "Only <glib.h> can be included directly."
+
+--- gtkwave-3.3.27/src/tcl_commands.c
++++ gtkwave-3.3.27/src/tcl_commands.c
+@@ -12,7 +12,7 @@
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #if WAVE_USE_GTK2
+-#include <glib/gconvert.h>
++#include <glib.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+--- gtkwave-3.3.27/src/tcl_helper.c
++++ gtkwave-3.3.27/src/tcl_helper.c
+@@ -12,7 +12,7 @@
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #if WAVE_USE_GTK2
+-#include <glib/gconvert.h>
++#include <glib.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/gtkwave.spec b/gtkwave.spec
index 15e6367..a8bec14 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -5,7 +5,7 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.3.26
+Version:	3.3.27
 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.27-glib-includes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	gtk2-devel, bzip2-devel, Judy-devel, xz-devel, zlib-devel
 BuildRequires:	gperf, flex, desktop-file-utils
@@ -35,6 +36,9 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 cp -p .gtkwaverc gtkwaverc.sample
 
+# Current glib2 is fussy about header usage
+%patch0 -p1
+
 %build
 %{configure} --disable-dependency-tracking \
 %if 0%{?fedora} < 2 && 0%{?rhel} < 4
@@ -130,6 +134,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Oct 25 2011 Paul Howarth <paul at city-fan.org> 3.3.27-1
+- update to 3.3.27
+  - fixes of suspicious NULL pointer warnings from scan-build
+  - fixed inline function linker errors when using Clang
+  - optimization of more [1] cases found in analyzer.h when
+    -DWAVE_USE_STRUCT_PACKING is active
+  - in process_url_list(), use g_malloc/g_free as context can or will change
+    when files are loaded
+  - added fix for DnD crash when Quartz is the GDK back-end on Mac OSX
+  - fixed fstWriterFlushContext() such that invocations outside the fstapi are
+    synced with time changes
+  - modify main window size for twinwave on Quartz: GtkPlug window does not
+    fit into GtkSocket as with X11
+- add patch to fix up glib2 header file inclusion
+
 * Wed Sep 28 2011 Paul Howarth <paul at city-fan.org> 3.3.26-1
 - update to 3.3.26
   - Mac OSX fixes: removed restrictions for twinwave, compile fixes for Tcl
diff --git a/sources b/sources
index ad03de4..47c7745 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-8b25a82cfece9611b38d6abd22125192  gtkwave-3.3.26.tar.gz
+0ab7f1a239c73ed7773ef0a33db6a683  gtkwave-3.3.27.tar.gz
 2cc7754492918591242bc38a0b11d2a5  gtkwave-16.png
 410c50539074403d3a3240f7c9209b11  gtkwave-32.png
 4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png