diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
| commit | 7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df (patch) | |
| tree | 504a250d235a3bc39571e6af1c755077390a371f /gnu/packages/patches/plotutils-libpng-jmpbuf.patch | |
| parent | f20d1cfb51ed14f325da000406807076323f70bc (diff) | |
| parent | b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 (diff) | |
| download | guix-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.tar.gz guix-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/plotutils-libpng-jmpbuf.patch')
| -rw-r--r-- | gnu/packages/patches/plotutils-libpng-jmpbuf.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch b/gnu/packages/patches/plotutils-libpng-jmpbuf.patch deleted file mode 100644 index 07ef60996c..0000000000 --- a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0: -http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt . - ---- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200 -+++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200 -@@ -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 |