diff options
| -rw-r--r-- | editors/emacs22/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs22/patches/patch-af | 57 |
2 files changed, 58 insertions, 3 deletions
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo index 630e9df2acb..682845d4d2c 100644 --- a/editors/emacs22/distinfo +++ b/editors/emacs22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2013/07/05 13:39:05 ryoon Exp $ +$NetBSD: distinfo,v 1.15 2014/05/23 22:29:33 dholland Exp $ SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 2fba73318718032623505da2a66eb5584a734b33 SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f -SHA1 (patch-af) = ccb864f27a1f40efd666fe49d7274d20b7382a7a +SHA1 (patch-af) = d0aead09f5e7bc8c65fc2a9f784ba263450e4c47 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831 diff --git a/editors/emacs22/patches/patch-af b/editors/emacs22/patches/patch-af index bf2b88c697f..4add93c8162 100644 --- a/editors/emacs22/patches/patch-af +++ b/editors/emacs22/patches/patch-af @@ -1,7 +1,8 @@ -$NetBSD: patch-af,v 1.3 2013/07/05 13:39:05 ryoon Exp $ +$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 @@ -56,3 +57,57 @@ $NetBSD: patch-af,v 1.3 2013/07/05 13:39:05 ryoon Exp $ 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))) |