Mercurial > mxe-octave

annotate src/plotutils-2.6-libpng-1.5.patch @ 5579:2734b3818171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid double-free with librsb (bug #58957). * src/librsb.mk: Add work-around to avoid double-free (provided by Michele Martone). * src/mingw-of-sparsersb-1-no-render.patch: Remove patch. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 02 Nov 2020 08:55:18 +0100
parents 99516e73b368
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1625
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1625
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 fix building with libpng-1.5
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 --- a/libplot/z_write.c
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 +++ b/libplot/z_write.c
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 @@ -164,7 +164,7 @@
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 }
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 /* cleanup after libpng errors (error handler does a longjmp) */
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 - if (setjmp (png_ptr->jmpbuf))
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 + if (png_jmpbuf (png_ptr))
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 {
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 png_destroy_write_struct (&png_ptr, (png_info **)NULL);
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 return -1;
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 @@ -444,7 +444,7 @@
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 #endif
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 }
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 - longjmp (png_ptr->jmpbuf, 1);
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 + longjmp (png_jmpbuf (png_ptr), 1);
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 }
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 static void
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 @@ -515,7 +515,7 @@
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 #endif
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 }
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 - longjmp (png_ptr->jmpbuf, 1);
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 + longjmp (png_jmpbuf (png_ptr), 1);
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 }
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34
7a3f723b7986 package plotutils: libpng 1.5 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 static void