Fri Jan 14 11:30:36 2011 UTC ()
Fix build with png-1.5.
(wiz)
diff -r1.5 -r1.6 pkgsrc/graphics/plotutils/distinfo
diff -r0 -r1.6 pkgsrc/graphics/plotutils/patches/patch-aa
--- pkgsrc/graphics/plotutils/distinfo 2010/05/02 13:28:43 1.5
+++ pkgsrc/graphics/plotutils/distinfo 2011/01/14 11:30:36 1.6
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2010/05/02 13:28:43 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2011/01/14 11:30:36 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (plotutils-2.6.tar.gz) = 7921301d9dfe8991e3df2829bd733df6b2a70838 | | 3 | SHA1 (plotutils-2.6.tar.gz) = 7921301d9dfe8991e3df2829bd733df6b2a70838 |
| 4 | RMD160 (plotutils-2.6.tar.gz) = 2a32244eb20e00b82a0742dde7b690f688e82774 | | 4 | RMD160 (plotutils-2.6.tar.gz) = 2a32244eb20e00b82a0742dde7b690f688e82774 |
| 5 | Size (plotutils-2.6.tar.gz) = 3657562 bytes | | 5 | Size (plotutils-2.6.tar.gz) = 3657562 bytes |
| | | 6 | SHA1 (patch-aa) = 953805bbe32d8e049cdd4de79cd8b4a77a49fc04 |
$NetBSD: patch-aa,v 1.6 2011/01/14 11:30:36 wiz Exp $
Fix build with png-1.5.
--- libplot/z_write.c.orig 2008-07-16 00:54:10.000000000 +0000
+++ 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,11 @@ _our_error_fn_stdio (png_struct *png_ptr
#endif
}
+#if (PNG_LIBPNG_VER < 10500)
longjmp (png_ptr->jmpbuf, 1);
+#else
+ png_longjmp (png_ptr, 1);
+#endif
}
static void
@@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt
#endif
}
+#if (PNG_LIBPNG_VER < 10500)
longjmp (png_ptr->jmpbuf, 1);
+#else
+ png_longjmp (png_ptr, 1);
+#endif
}
static void