summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2014-05-16 14:12:29 +0000
committertron <tron@pkgsrc.org>2014-05-16 14:12:29 +0000
commit71e244449457f4c60e5aadad1a5c519874fb5c2e (patch)
tree0cb02d3b57bfeaba90fbe61f31194fcd183d28e8 /editors
parent6ecb397d4051fb50bd0c464f98ccbc8402fcb67f (diff)
downloadpkgsrc-71e244449457f4c60e5aadad1a5c519874fb5c2e.tar.gz
Fix build with giflib 5.1.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs23/distinfo4
-rw-r--r--editors/emacs23/patches/patch-src_image.c21
2 files changed, 17 insertions, 8 deletions
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
index a8790be324a..44292a6089d 100644
--- a/editors/emacs23/distinfo
+++ b/editors/emacs23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/07/05 13:36:12 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2014/05/16 14:12:29 tron Exp $
SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
@@ -11,6 +11,6 @@ SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
SHA1 (patch-lisp_files.el) = e10c6949029ca7933ea632693843a911b7e010c2
SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9
-SHA1 (patch-src_image.c) = 674fb9334d089cbf30c545bc0ea83f728c138ddd
+SHA1 (patch-src_image.c) = 2712e1df3d5eac9e919163d47a2a331ac0bd0b9a
SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507
SHA1 (patch-src_xgselect.c) = 4a0b246eae2e43fc1e544210fc97c0170e3cffdc
diff --git a/editors/emacs23/patches/patch-src_image.c b/editors/emacs23/patches/patch-src_image.c
index a23edde72b9..42891f8485a 100644
--- a/editors/emacs23/patches/patch-src_image.c
+++ b/editors/emacs23/patches/patch-src_image.c
@@ -1,10 +1,19 @@
-$NetBSD: patch-src_image.c,v 1.1 2013/07/05 13:36:12 ryoon Exp $
+$NetBSD: patch-src_image.c,v 1.2 2014/05/16 14:12:29 tron Exp $
-* Fix build with giflib 5.0.
+* Fix build with giflib 5.1.
---- src/image.c.orig 2012-01-11 12:35:01.000000000 +0000
-+++ src/image.c
-@@ -7350,7 +7350,7 @@ gif_load (f, img)
+--- src/image.c.orig 2014-05-16 14:28:37.000000000 +0100
++++ src/image.c 2014-05-16 14:29:19.000000000 +0100
+@@ -7270,7 +7270,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
+@@ -7350,7 +7350,7 @@
}
/* Open the GIF file. */
@@ -13,7 +22,7 @@ $NetBSD: patch-src_image.c,v 1.1 2013/07/05 13:36:12 ryoon Exp $
if (gif == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
-@@ -7366,7 +7366,7 @@ gif_load (f, img)
+@@ -7366,7 +7366,7 @@
memsrc.len = SBYTES (specified_data);
memsrc.index = 0;