changeset 1625:7a3f723b7986

package plotutils: libpng 1.5 compatibility
author Mark Brand <mabrand@mabrand.nl>
date Thu, 03 Mar 2011 23:11:38 +0100
parents 37537debd5a1
children 5772a60b7521
files src/plotutils-2.6-libpng-1.5.patch
diffstat 1 files changed, 35 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/plotutils-2.6-libpng-1.5.patch	Thu Mar 03 23:11:38 2011 +0100
@@ -0,0 +1,35 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
+fix building with libpng-1.5
+
+--- a/libplot/z_write.c
++++ b/libplot/z_write.c
+@@ -164,7 +164,7 @@
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (png_jmpbuf (png_ptr))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf (png_ptr), 1);
+ }
+ 
+ static void 
+@@ -515,7 +515,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf (png_ptr), 1);
+ }
+ 
+ static void