head 1.5; access; symbols pkgsrc-2017Q3:1.4.0.30 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.26 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.24 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.22 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.20 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.18 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.16 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.14 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.12 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.10 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.8 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.6 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.4 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.2 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.3.0.6 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.4 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.2 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.2.0.20 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.18 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.16 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.1.0.6 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.4 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.2 pkgsrc-2010Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2017.09.29.12.40.29; author wiz; state dead; branches; next 1.4; commitid ZRYX7Ib64A6cG59A; 1.4 date 2014.05.23.22.29.33; author dholland; state Exp; branches; next 1.3; commitid Aj56m2ApUVv2kIBx; 1.3 date 2013.07.05.13.39.05; author ryoon; state Exp; branches; next 1.2; commitid 3R4vfjh5Gm0OJhWw; 1.2 date 2011.01.14.11.06.52; author tron; state Exp; branches; next 1.1; 1.1 date 2010.06.24.22.19.24; author wiz; state Exp; branches; next ; desc @@ 1.5 log @emacs22*, emacs23*, emacs24*: remove unmaintained emacs versions As announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/11/msg025563.html This still leaves emacs20, emacs21, and the current version, emacs25. @ text @$NetBSD: patch-af,v 1.4 2014/05/23 22:29:33 dholland Exp $ * Build fix for newer versions of "libpng". * Build fix for 5.0 version of giflib. * Further build fixes for giflib 5.1. --- src/image.c.orig 2008-08-25 22:18:33.000000000 +0000 +++ src/image.c @@@@ -6328,11 +6328,7 @@@@ png_image_p (object) #ifdef HAVE_PNG -#if defined HAVE_LIBPNG_PNG_H -# include -#else # include -#endif #ifdef HAVE_NTGUI /* PNG library details. */ @@@@ -6427,7 +6423,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 } @@@@ -6603,7 +6603,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) @@@@ -8108,7 +8108,7 @@@@ gif_load (f, img) /* Open the GIF file. Casting return value avoids a GCC warning on W32. */ - gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file)); + gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file), NULL); if (gif == NULL) { image_error ("Cannot open `%s'", file, Qnil); @@@@ -8125,7 +8125,7 @@@@ gif_load (f, img) memsrc.index = 0; /* Casting return value avoids a GCC warning on W32. */ - gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory); + gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory, NULL); if (!gif) { image_error ("Cannot open memory source `%s'", img->spec, Qnil); @@@@ -8138,7 +8138,7 @@@@ gif_load (f, img) if (!check_image_size (f, gif->SWidth, gif->SHeight)) { image_error ("Invalid image size", Qnil, Qnil); - fn_DGifCloseFile (gif); + fn_DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -8148,7 +8148,7 @@@@ gif_load (f, img) if (rc == GIF_ERROR) { image_error ("Error reading `%s'", img->spec, Qnil); - fn_DGifCloseFile (gif); + fn_DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -8159,7 +8159,7 @@@@ gif_load (f, img) { image_error ("Invalid image number `%s' in image `%s'", image, img->spec); - fn_DGifCloseFile (gif); + fn_DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -8181,7 +8181,7 @@@@ gif_load (f, img) if (!check_image_size (f, width, height)) { image_error ("Invalid image size", Qnil, Qnil); - fn_DGifCloseFile (gif); + fn_DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -8189,7 +8189,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)) { - fn_DGifCloseFile (gif); + fn_DGifCloseFile (gif, NULL); UNGCPRO; return 0; } @@@@ -8296,7 +8296,7 @@@@ gif_load (f, img) Fcons (make_number (gif->ImageCount), img->data.lisp_val)); - fn_DGifCloseFile (gif); + fn_DGifCloseFile (gif, NULL); /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) @ 1.4 log @Fix build after giflib update. Doesn't anyone test anything? @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2013/07/05 13:39:05 ryoon Exp $ @ 1.3 log @Bump PKGREVISION. * Fix build for giflib 5.0.4. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.2 2011/01/14 11:06:52 tron Exp $ d5 1 d60 54 @ 1.2 log @Port Thomas Klausner's "png" build fix from the "emacs23" package to this emacs version. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 2010/06/24 22:19:24 wiz Exp $ d3 2 a4 1 Build fix for newer versions of "libpng". d6 3 a8 3 --- src/image.c.orig 2008-08-25 23:18:33.000000000 +0100 +++ src/image.c 2011-01-14 10:54:46.000000000 +0000 @@@@ -6328,11 +6328,7 @@@@ d20 1 a20 1 @@@@ -6427,7 +6423,11 @@@@ d32 1 a32 1 @@@@ -6603,7 +6603,7 @@@@ d41 18 @ 1.1 log @Add workaround for systems coming with a copy of libpng. Closes PR pkg/43485 reported by Rob Quinn. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Workaround for systems coming with another copy of libpng (see PR 43485). d5 3 a7 3 --- src/image.c.orig 2008-08-25 22:18:33.000000000 +0000 +++ src/image.c @@@@ -6328,11 +6328,7 @@@@ png_image_p (object) d19 21 @