diff options
| author | wiz <wiz@pkgsrc.org> | 2011-01-14 11:22:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-01-14 11:22:37 +0000 |
| commit | 4ca2dd6d081baf090bd33c623521a669b7bff325 (patch) | |
| tree | 2114af34b567a5216efff423b28aadf040c177ab /graphics/plotutils/patches | |
| parent | d49bc7d47ba7ae51702f37a32ed600f435a5e44b (diff) | |
| download | pkgsrc-4ca2dd6d081baf090bd33c623521a669b7bff325.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'graphics/plotutils/patches')
| -rw-r--r-- | graphics/plotutils/patches/patch-aa | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/graphics/plotutils/patches/patch-aa b/graphics/plotutils/patches/patch-aa new file mode 100644 index 00000000000..6123223d255 --- /dev/null +++ b/graphics/plotutils/patches/patch-aa @@ -0,0 +1,39 @@ +$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 |