head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.96 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.94 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.92 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.90 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.88 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.86 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.84 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.82 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.80 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.78 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.76 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.74 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.72 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.70 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.68 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.66 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.64 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.62 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.60 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.58 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.56 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.54 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.52 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.48 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.28 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.50 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.46 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.44 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.42 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.40 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.38 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.36 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.34 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.32 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.30 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.26 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.24 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.22 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.20 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.18 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.16 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.14 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.12 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.10 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.8 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.6 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.4 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.2 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.2.0.6 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.4 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.2 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.1.0.20 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.18 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.16 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.14 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.12 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.10 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.8 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.6 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.4 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.2 pkgsrc-2011Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2014.05.23.22.34.41; author dholland; state Exp; branches; next 1.2; commitid eWQXwSISgu6PlIBx; 1.2 date 2013.07.05.13.43.44; author ryoon; state Exp; branches; next 1.1; commitid zGgoymF1r8qoLhWw; 1.1 date 2011.01.24.09.42.40; author wiz; state Exp; branches; next ; desc @@ 1.3 log @Fix build with new giflib. @ text @$NetBSD: patch-ax,v 1.2 2013/07/05 13:43:44 ryoon Exp $ * Fix build with png-1.5. * Fix build with giflib 5.0. * Fix build with giflib 5.1. --- src/xfns.c.orig 2002-12-06 17:05:35.000000000 +0000 +++ src/xfns.c @@@@ -8541,7 +8541,11 @@@@ my_png_error (png_ptr, msg) { xassert (png_ptr != NULL); image_error ("PNG error: %s", build_string (msg), Qnil); +#if (PNG_LIBPNG_VER < 10500) longjmp (png_ptr->jmpbuf, 1); +#else + png_longjmp (png_ptr, 1); +#endif } @@@@ -8699,7 +8703,7 @@@@ png_load (f, img) /* Set error jump-back. We come back here when the PNG library detects an error. */ - if (setjmp (png_ptr->jmpbuf)) + if (setjmp (png_jmpbuf(png_ptr))) { error: if (png_ptr) @@@@ -9759,7 +9763,7 @@@@ gif_load (f, img) } /* Open the GIF file. */ - gif = DGifOpenFileName (XSTRING (file)->data); + gif = DGifOpenFileName (XSTRING (file)->data, NULL); if (gif == NULL) { image_error ("Cannot open `%s'", file, Qnil); @@@@ -9775,7 +9779,7 @@@@ gif_load (f, img) memsrc.len = STRING_BYTES (XSTRING (specified_data)); memsrc.index = 0; - gif = DGifOpen(&memsrc, gif_read_from_memory); + gif = DGifOpen(&memsrc, gif_read_from_memory, NULL); if (!gif) { image_error ("Cannot open memory source `%s'", img->spec, Qnil); @@@@ -9789,7 +9793,7 @@@@ gif_load (f, img) if (rc == GIF_ERROR) { image_error ("Error reading `%s'", img->spec, Qnil); - DGifCloseFile (gif); + DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -9800,7 +9804,7 @@@@ gif_load (f, img) { image_error ("Invalid image number `%s' in image `%s'", image, img->spec); - DGifCloseFile (gif); + DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -9811,7 +9815,7 @@@@ gif_load (f, img) /* Create the X image and pixmap. */ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) { - DGifCloseFile (gif); + DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -9903,7 +9907,7 @@@@ gif_load (f, img) } } - DGifCloseFile (gif); + DGifCloseFile (gif, NULL); /* Put the image into the pixmap, then free the X image and its buffer. */ x_put_x_image (f, ximg, img->pixmap, width, height); @ 1.2 log @Bump PKGREVISION. * Fix build for giflib 5.0.4. @ text @d1 1 a1 1 $NetBSD: patch-ax,v 1.1 2011/01/24 09:42:40 wiz Exp $ d5 1 d48 36 @ 1.1 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 1 Fix build with png-1.5. d29 18 @