diff options
| author | dholland <dholland@pkgsrc.org> | 2014-05-23 22:34:41 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-05-23 22:34:41 +0000 |
| commit | 51e6e01f3831fdebac0c9eeeaedcb916216a3e3b (patch) | |
| tree | 0f52bc13de11d8326cb871c14399eeba1b874d43 /editors | |
| parent | 43218ee011bfe666591b6268fb9f6d9de3738fed (diff) | |
| download | pkgsrc-51e6e01f3831fdebac0c9eeeaedcb916216a3e3b.tar.gz | |
Fix build with new giflib.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs21/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs21/patches/patch-ax | 39 |
2 files changed, 40 insertions, 3 deletions
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo index da3304a4680..5e30deddeef 100644 --- a/editors/emacs21/distinfo +++ b/editors/emacs21/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/10/27 20:41:49 joerg Exp $ +$NetBSD: distinfo,v 1.16 2014/05/23 22:34:41 dholland Exp $ SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a @@ -26,7 +26,7 @@ SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263 SHA1 (patch-aw) = d7d9013734853a9542fd657f1b532d3c108f88e0 -SHA1 (patch-ax) = 1b4abed8dca34f6148a5f0dd4b323e19e8c799b2 +SHA1 (patch-ax) = d2fe8db12f7a3533699037e840a2e35c4cbf0be9 SHA1 (patch-ay) = 82e4eb371be4dff891878973888c38ca53e9f326 SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25 diff --git a/editors/emacs21/patches/patch-ax b/editors/emacs21/patches/patch-ax index a7a343505fb..132615d0e6f 100644 --- a/editors/emacs21/patches/patch-ax +++ b/editors/emacs21/patches/patch-ax @@ -1,7 +1,8 @@ -$NetBSD: patch-ax,v 1.2 2013/07/05 13:43:44 ryoon Exp $ +$NetBSD: patch-ax,v 1.3 2014/05/23 22:34:41 dholland 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 @@ -44,3 +45,39 @@ $NetBSD: patch-ax,v 1.2 2013/07/05 13:43:44 ryoon Exp $ 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); |