diff options
| author | tron <tron@pkgsrc.org> | 2014-05-16 09:08:57 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2014-05-16 09:08:57 +0000 |
| commit | 1c801c83e601d8dc4f0a1e2c3c4d0a7a564eec4c (patch) | |
| tree | 4c3f3199dc11a645cced5349fdc8ebedec4b2eb3 /editors | |
| parent | f88adea5a02344ae87b08a44c40af0b2b5ad5550 (diff) | |
| download | pkgsrc-1c801c83e601d8dc4f0a1e2c3c4d0a7a564eec4c.tar.gz | |
Fix build with giflib 5.1.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs24/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs24/patches/patch-src_image.c | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo index 68446734b5f..cafab3ee724 100644 --- a/editors/emacs24/distinfo +++ b/editors/emacs24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2013/07/05 13:33:40 ryoon Exp $ +$NetBSD: distinfo,v 1.12 2014/05/16 09:08:57 tron Exp $ SHA1 (emacs-24.3.tar.gz) = 3c672a176df06e20d2661058ad49893f184b4956 RMD160 (emacs-24.3.tar.gz) = b67e847861002bbb76ae6588ff659408763313cf @@ -8,4 +8,4 @@ SHA1 (patch-ab) = 3d6c52d2e9ae934d955ae5bea0ef346d9fa428b9 SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac SHA1 (patch-ag) = 407d34e97356c2e8bee26f0fd90f116dd194afcb SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29 -SHA1 (patch-src_image.c) = cb9b00c5478587d2e54286312411605753e66f5c +SHA1 (patch-src_image.c) = 5b98fbfd012437674533556229ee747000175dfa diff --git a/editors/emacs24/patches/patch-src_image.c b/editors/emacs24/patches/patch-src_image.c index 87293e23ad8..b53905f8c8f 100644 --- a/editors/emacs24/patches/patch-src_image.c +++ b/editors/emacs24/patches/patch-src_image.c @@ -1,10 +1,19 @@ -$NetBSD: patch-src_image.c,v 1.1 2013/07/05 13:33:40 ryoon Exp $ +$NetBSD: patch-src_image.c,v 1.2 2014/05/16 09:08:57 tron Exp $ -* Fix build with giflib 5.0. +Fix build with giflib 5.1. --- src/image.c.orig 2013-01-01 20:37:17.000000000 +0000 -+++ src/image.c -@@ -7192,7 +7192,7 @@ gif_load (struct frame *f, struct image ++++ src/image.c 2014-05-16 09:42:14.000000000 +0100 +@@ -7121,7 +7121,7 @@ + + #else + +-#define fn_DGifCloseFile DGifCloseFile ++#define fn_DGifCloseFile(gf) DGifCloseFile((gf), NULL) + #define fn_DGifSlurp DGifSlurp + #define fn_DGifOpen DGifOpen + #define fn_DGifOpenFileName DGifOpenFileName +@@ -7192,7 +7192,7 @@ } /* Open the GIF file. */ @@ -13,7 +22,7 @@ $NetBSD: patch-src_image.c,v 1.1 2013/07/05 13:33:40 ryoon Exp $ if (gif == NULL) { image_error ("Cannot open `%s'", file, Qnil); -@@ -7213,7 +7213,7 @@ gif_load (struct frame *f, struct image +@@ -7213,7 +7213,7 @@ memsrc.len = SBYTES (specified_data); memsrc.index = 0; |