From f4280dc0a6ef20c2abf6db4b5afb142d86ebca36 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Aug 01 2012 16:27:53 +0000
Subject: zlib, libpng fixes.


---

diff --git a/grace-zlib-libpng.patch b/grace-zlib-libpng.patch
new file mode 100644
index 0000000..33862b5
--- /dev/null
+++ b/grace-zlib-libpng.patch
@@ -0,0 +1,20 @@
+diff -Naur grace-5.1.22.orig/src/rstdrv.c grace-5.1.22/src/rstdrv.c
+--- grace-5.1.22.orig/src/rstdrv.c	2004-07-03 16:47:46.000000000 -0400
++++ grace-5.1.22/src/rstdrv.c	2012-07-26 17:17:53.081271670 -0400
+@@ -54,6 +54,7 @@
+ 
+ #ifdef HAVE_LIBPNG
+ #  include <png.h>
++#  include <zlib.h>
+ #endif
+ 
+ #ifndef NONE_GUI
+@@ -885,7 +886,7 @@
+         return;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return;
+     }
diff --git a/grace.spec b/grace.spec
index 96444e2..0d779c2 100644
--- a/grace.spec
+++ b/grace.spec
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.22
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -17,6 +17,7 @@ Source4:        LICENSE.cephes
 Patch0:         %{name}-gracerc-no_auxiliary.diff
 Patch1:         %{name}-detect-netcdf.diff
 Patch2:         http://ftp.de.debian.org/debian/pool/main/g/grace/grace_5.1.22-1.diff.gz
+Patch3:         grace-zlib-libpng.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
@@ -67,6 +68,8 @@ Install these files if you need to compile software that requires grace.
 %patch2 -p1
 patch -p1 < debian/patches/tmpnam_to_mkstemp.diff
 
+%patch3 -p1 -b .zlib-libpng
+
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
 rm -rf Xbae T1lib
@@ -227,6 +230,9 @@ fi
 
 
 %changelog
+* Wed Aug 01 2012 Jon Ciesla <limburgher@gmail.com> - 5.1.22-14
+- Tom Lane's zlib, libpng15 fixes, BZ 843647.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.22-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild