[gtkwave] Update to 3.3.42

[Paul Howarth]

commit 2f6b2bcb07fbd3f1b110a2cfaed22288a73b0923
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Jan 2 12:50:37 2013 +0000

    Update to 3.3.42
    
    - New upstream release 3.3.42
      - Fix to prevent missing group openings from keeping other signals in the
        viewer that follow from displaying
      - Added more support for newer constructs in Vermin
      - Added scrollwheel support to rtlbrowse code windows
      - Added fseeko() return checking in fstapi.c to prevent errors with
        dynamically updated files
    - Add patch to fix build with gtk2 < 2.14

 gtkwave-3.3.42-oldgtk2.patch |   26 ++++++++++++++++++++++++++
 gtkwave.spec                 |   16 +++++++++++++++-
 sources                      |    2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/gtkwave-3.3.42-oldgtk2.patch b/gtkwave-3.3.42-oldgtk2.patch
new file mode 100644
index 0000000..c268c3c
--- /dev/null
+++ b/gtkwave-3.3.42-oldgtk2.patch
@@ -0,0 +1,26 @@
+gtk_adjustment_get_page_increment and gtk_adjustment_get_step_increment
+were introduced in gtk 2.14:
+
+http://maemo.org/api_refs/5.0/beta/gtk/api-index-2-14.html
+
+--- contrib/rtlbrowse/logfile.c
++++ contrib/rtlbrowse/logfile.c
+@@ -1268,7 +1268,7 @@
+ return(FALSE); /* call remaining handlers... */
+ }
+ 
+-#if defined(WAVE_USE_GTK2) && !defined(GTK_ENABLE_BROKEN)
++#if defined(WAVE_USE_GTK2) && !defined(GTK_ENABLE_BROKEN) && GTK_CHECK_VERSION(2,14,0)
+ static        gint
+ scroll_event( GtkWidget * widget, GdkEventScroll * event, gpointer text)
+ {
+@@ -1379,7 +1379,9 @@
+                        GTK_SIGNAL_FUNC(button_release_event), NULL);
+ 
+ #if defined(WAVE_USE_GTK2) && !defined(GTK_ENABLE_BROKEN)
++#if GTK_CHECK_VERSION(2,14,0)
+ gtk_signal_connect (GTK_OBJECT (text), "scroll_event",GTK_SIGNAL_FUNC(scroll_event), text);
++#endif
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_CHAR);
+ #else
+ gtk_text_set_word_wrap(GTK_TEXT(text), FALSE);
diff --git a/gtkwave.spec b/gtkwave.spec
index e14bb0a..e5b98d3 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -5,7 +5,7 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.3.41
+Version:	3.3.42
 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.42-oldgtk2.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
@@ -36,6 +37,9 @@ tools.
 %prep
 %setup -q -n gtkwave-%{version}%{?prerel}
 
+# Fix build with gtk2 < 2.14
+%patch0
+
 %build
 %{configure} \
 	--disable-dependency-tracking \
@@ -189,6 +193,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Jan  2 2013 Paul Howarth <paul at city-fan.org> 3.3.42-1
+- update to 3.3.42
+  - fix to prevent missing group openings from keeping other signals in the
+    viewer that follow from displaying
+  - added more support for newer constructs in Vermin
+  - added scrollwheel support to rtlbrowse code windows
+  - added fseeko() return checking in fstapi.c to prevent errors with
+    dynamically updated files
+- add patch to fix build with gtk2 < 2.14
+
 * Fri Nov  2 2012 Paul Howarth <paul at city-fan.org> 3.3.41-1
 - update to 3.3.41
   - fix for gtkwave::addSignalsFromList when encountering signals of form
diff --git a/sources b/sources
index 2836182..d32589a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-aeb60ba874228ef5175d44a9adfccbf4  gtkwave-3.3.41.tar.gz
+7a7263e068e4c0a731c4b6723dbe261d  gtkwave-3.3.42.tar.gz
 2cc7754492918591242bc38a0b11d2a5  gtkwave-16.png
 410c50539074403d3a3240f7c9209b11  gtkwave-32.png
 4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png