From e12d2608f61c93c83fba9209feda336c393fa040 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 29 Jun 2014 18:07:30 +0000 Subject: Add part of the emacs24 patch for giflib 5.1. --- editors/emacs-snapshot/distinfo | 3 ++- editors/emacs-snapshot/patches/patch-src_image.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 editors/emacs-snapshot/patches/patch-src_image.c (limited to 'editors/emacs-snapshot') diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo index 061882d367b..fc1a91efa9b 100644 --- a/editors/emacs-snapshot/distinfo +++ b/editors/emacs-snapshot/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2014/04/16 21:02:19 joerg Exp $ +$NetBSD: distinfo,v 1.67 2014/06/29 18:07:30 dholland Exp $ SHA1 (emacs-snapshot_20140101.orig.tar.xz) = b5241baa81e1ed8a694caf29aa11cd7602d60b61 RMD160 (emacs-snapshot_20140101.orig.tar.xz) = 6bd8e699b7520612b1f4b731dff2654ed528c9d9 @@ -7,4 +7,5 @@ SHA1 (patch-ad) = 61769812ed721e8d881a954983bbdbba01537104 SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 SHA1 (patch-ag) = e30b57d3536e31adbd5b0f0c91696de0de2c0f35 SHA1 (patch-configure.ac) = d70c1f67e1ecc42ca19aab6ca32819008f0e7f56 +SHA1 (patch-src_image.c) = 4769e3df1e305495ed85af41faf87e1a40428c4e SHA1 (patch-src_process.c) = e3e9ae43f4bfa373e51eb3e6a1f864ebf1bbc308 diff --git a/editors/emacs-snapshot/patches/patch-src_image.c b/editors/emacs-snapshot/patches/patch-src_image.c new file mode 100644 index 00000000000..8f72a455c45 --- /dev/null +++ b/editors/emacs-snapshot/patches/patch-src_image.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_image.c,v 1.1 2014/06/29 18:07:30 dholland Exp $ + +Fix build with giflib 5.1. + +--- src/image.c.orig 2013-12-31 19:06:18.000000000 +0000 ++++ src/image.c +@@ -7289,7 +7289,7 @@ init_gif_functions (void) + + #else + +-#define fn_DGifCloseFile DGifCloseFile ++#define fn_DGifCloseFile(gf) DGifCloseFile((gf), NULL) + #define fn_DGifSlurp DGifSlurp + #define fn_DGifOpen DGifOpen + #define fn_DGifOpenFileName DGifOpenFileName -- cgit v1.2.3