From 161aa93e5d407ab90e35de2ed88d97dff7e46f6b4d844dde6d9ee1957aa81985 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Wed, 29 Aug 2012 12:40:46 +0000
Subject: [PATCH 1/2] Accepting request 131961 from home:pgajdos:libpng15

- build also with libpng15
  * libpng15.patch

OBS-URL: https://build.opensuse.org/request/show/131961
OBS-URL: https://build.opensuse.org/package/show/Publishing/plotutils?expand=0&rev=10
---
 plotutils-libpng15.patch | 31 +++++++++++++++++++++++++++++++
 plotutils.changes        |  6 ++++++
 plotutils.spec           |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 plotutils-libpng15.patch

diff --git a/plotutils-libpng15.patch b/plotutils-libpng15.patch
new file mode 100644
index 0000000..e5269b0
--- /dev/null
+++ b/plotutils-libpng15.patch
@@ -0,0 +1,31 @@
+Index: plotutils-2.6/libplot/z_write.c
+===================================================================
+--- plotutils-2.6.orig/libplot/z_write.c
++++ plotutils-2.6/libplot/z_write.c
+@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf(png_ptr)))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf(png_ptr), 1);
+ }
+ 
+ static void 
+@@ -515,7 +515,7 @@ _our_error_fn_stream (png_struct *png_pt
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf(png_ptr), 1);
+ }
+ 
+ static void 
diff --git a/plotutils.changes b/plotutils.changes
index 25f9564..d9a8176 100644
--- a/plotutils.changes
+++ b/plotutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 29 12:39:58 UTC 2012 - pgajdos@suse.com
+
+- build also with libpng15
+  * libpng15.patch
+
 -------------------------------------------------------------------
 Mon Aug  6 13:20:52 UTC 2012 - pgajdos@suse.com
 
diff --git a/plotutils.spec b/plotutils.spec
index f2d0683..9749cc6 100644
--- a/plotutils.spec
+++ b/plotutils.spec
@@ -37,6 +37,7 @@ Patch:          plotutils-man.patch
 Patch1:         plotutils-uninitialized.patch
 Patch2:         plotutils-dasharray-format.patch
 Patch3:         plotutils-autoreconf.patch
+Patch4:         plotutils-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -164,6 +165,7 @@ Authors:
 %patch1
 %patch2
 %patch3
+%patch4 -p1
 # Force update lex and bison code:
 grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r rm -f
 

From a56de7cd51e7ed12c185fe71f371c08abce660b70500e749bb9822a8cfc3d17d Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Thu, 30 Aug 2012 08:49:52 +0000
Subject: [PATCH 2/2] Accepting request 132049 from home:pgajdos:libpng15

OBS-URL: https://build.opensuse.org/request/show/132049
OBS-URL: https://build.opensuse.org/package/show/Publishing/plotutils?expand=0&rev=11
---
 plotutils.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plotutils.spec b/plotutils.spec
index 9749cc6..2e9fe98 100644
--- a/plotutils.spec
+++ b/plotutils.spec
@@ -37,6 +37,7 @@ Patch:          plotutils-man.patch
 Patch1:         plotutils-uninitialized.patch
 Patch2:         plotutils-dasharray-format.patch
 Patch3:         plotutils-autoreconf.patch
+# libpng15.patch sent 2012-08-30 at rsm@math.arizona.edu
 Patch4:         plotutils-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build