[zvbi] Fix build with libpng-1.5

[Hans de Goede]

commit 93650a589ca291c31336d5bf8c5ab907db1fb5d3
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Dec 6 13:43:54 2011 +0100

    Fix build with libpng-1.5

 zvbi-0.2.33-libpng15.patch |   17 +++++++++++++++++
 zvbi.spec                  |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/zvbi-0.2.33-libpng15.patch b/zvbi-0.2.33-libpng15.patch
new file mode 100644
index 0000000..4eeae5b
--- /dev/null
+++ b/zvbi-0.2.33-libpng15.patch
@@ -0,0 +1,17 @@
+diff -up zvbi-0.2.33/src/exp-gfx.c~ zvbi-0.2.33/src/exp-gfx.c
+--- zvbi-0.2.33/src/exp-gfx.c~	2008-02-24 15:17:47.000000000 +0100
++++ zvbi-0.2.33/src/exp-gfx.c	2011-12-06 13:40:25.218139962 +0100
+@@ -1672,11 +1672,11 @@ write_png			(gfx_instance *		gfx,
+ 	char title[80];
+ 	unsigned int i;
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (png_jmpbuf (png_ptr))
+ 		return FALSE;
+ 
+ 	png_set_write_fn (png_ptr,
+-			  (voidp) gfx,
++			  gfx,
+ 			  write_data,
+ 			  flush_data);
+ 
diff --git a/zvbi.spec b/zvbi.spec
index b3bad26..77ef844 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -3,7 +3,7 @@
 
 Name:               zvbi
 Version:            0.2.33
-Release:            10%{?dist}
+Release:            11%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
 # See NEWS for a full breakdown of licensing.
@@ -13,6 +13,7 @@ Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
 Patch2:		    %{name}-0.2.33-stat.patch
+Patch3:             %{name}-0.2.33-libpng15.patch
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
 BuildRequires:      gettext >= 0.16.1
@@ -66,6 +67,7 @@ Fonts from zvbi converted for use with X11
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 #Fix character encodings
 iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
@@ -206,6 +208,9 @@ fi
 
 
 %changelog
+* Tue Dec 06 2011 Hans de Goede <hdegoede at redhat.com> - 0.2.33-11
+- Fix build with libpng-1.5
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.2.33-10
 - Rebuild for new libpng