Fri Jul 5 13:33:40 2013 UTC ()
Bump PKGREVISON.

* Fix build with giflib 5.0.4.


(ryoon)
diff -r1.17 -r1.18 pkgsrc/editors/emacs24/Makefile
diff -r1.10 -r1.11 pkgsrc/editors/emacs24/distinfo
diff -r1.7 -r1.8 pkgsrc/editors/emacs24/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/editors/emacs24/patches/patch-ab
diff -r0 -r1.1 pkgsrc/editors/emacs24/patches/patch-src_image.c
cvs diff -r1.17 -r1.18 pkgsrc/editors/emacs24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/Makefile 2013/06/06 12:54:15 1.17
+++ pkgsrc/editors/emacs24/Attic/Makefile 2013/07/05 13:33:40 1.18
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2013/06/06 12:54:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2013/07/05 13:33:40 ryoon Exp $
2 2
3CONFLICTS+= emacs24-nox11-[0-9]* 3CONFLICTS+= emacs24-nox11-[0-9]*
4PKGREVISION= 3 4PKGREVISION= 4
5 5
6.include "../../editors/emacs24/Makefile.common" 6.include "../../editors/emacs24/Makefile.common"
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10SUBST_CLASSES+= prefix 10SUBST_CLASSES+= prefix
11SUBST_STAGE.prefix= pre-configure 11SUBST_STAGE.prefix= pre-configure
12SUBST_VARS.prefix= PREFIX 12SUBST_VARS.prefix= PREFIX
13SUBST_FILES.prefix= src/s/netbsd.h 13SUBST_FILES.prefix= src/s/netbsd.h
14 14
15.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 15.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
16.include "../../sysutils/desktop-file-utils/desktopdb.mk" 16.include "../../sysutils/desktop-file-utils/desktopdb.mk"
17.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/editors/emacs24/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/distinfo 2013/03/22 18:05:09 1.10
+++ pkgsrc/editors/emacs24/Attic/distinfo 2013/07/05 13:33:40 1.11
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.10 2013/03/22 18:05:09 marino Exp $ 1$NetBSD: distinfo,v 1.11 2013/07/05 13:33:40 ryoon Exp $
2 2
3SHA1 (emacs-24.3.tar.gz) = 3c672a176df06e20d2661058ad49893f184b4956 3SHA1 (emacs-24.3.tar.gz) = 3c672a176df06e20d2661058ad49893f184b4956
4RMD160 (emacs-24.3.tar.gz) = b67e847861002bbb76ae6588ff659408763313cf 4RMD160 (emacs-24.3.tar.gz) = b67e847861002bbb76ae6588ff659408763313cf
5Size (emacs-24.3.tar.gz) = 52543898 bytes 5Size (emacs-24.3.tar.gz) = 52543898 bytes
6SHA1 (patch-aa) = 9c1c68344f446b85eba7d3bdc244ffa7c1983b67 6SHA1 (patch-aa) = 992373f582bbd99733361bae99bf54587a89a10d
7SHA1 (patch-ab) = 1143637a0fdc6ebc9503691f6e90c630c98532d2 7SHA1 (patch-ab) = 3d6c52d2e9ae934d955ae5bea0ef346d9fa428b9
8SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac 8SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac
9SHA1 (patch-ag) = 407d34e97356c2e8bee26f0fd90f116dd194afcb 9SHA1 (patch-ag) = 407d34e97356c2e8bee26f0fd90f116dd194afcb
10SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29 10SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29
 11SHA1 (patch-src_image.c) = cb9b00c5478587d2e54286312411605753e66f5c
cvs diff -r1.7 -r1.8 pkgsrc/editors/emacs24/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/patches/Attic/patch-aa 2013/03/22 18:05:10 1.7
+++ pkgsrc/editors/emacs24/patches/Attic/patch-aa 2013/07/05 13:33:40 1.8
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-aa,v 1.7 2013/03/22 18:05:10 marino Exp $ 1$NetBSD: patch-aa,v 1.8 2013/07/05 13:33:40 ryoon Exp $
2 2
3Add DragonFly 3* Add DragonFly
 4* Fix giflib 5.0 build.
4 5
5--- configure.ac.orig 2013-03-05 08:24:59.000000000 +0000 6--- configure.ac.orig 2013-03-05 08:24:59.000000000 +0000
6+++ configure.ac 7+++ configure.ac
7@@ -476,6 +476,14 @@ case "${canonical}" in 8@@ -476,6 +476,14 @@ case "${canonical}" in
8 powerpc-ibm-aix[56]* ) 9 powerpc-ibm-aix[56]* )
9 opsys=aix4-2 10 opsys=aix4-2
10 ;; 11 ;;
11+ ## DragonFly ports 12+ ## DragonFly ports
12+ *-*-dragonfly*) 13+ *-*-dragonfly*)
13+ opsys=dragonfly 14+ opsys=dragonfly
14+ case "${canonical}" in 15+ case "${canonical}" in
15+ i[3456]86-*-dragonfly*) machine=intel386 ;; 16+ i[3456]86-*-dragonfly*) machine=intel386 ;;
16+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 17+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
@@ -68,108 +69,118 @@ Add DragonFly @@ -68,108 +69,118 @@ Add DragonFly
68+ if test ! -f $crt_gcc_subdir/$f; then 69+ if test ! -f $crt_gcc_subdir/$f; then
69+ AC_MSG_ERROR([Required file not found: $f]) 70+ AC_MSG_ERROR([Required file not found: $f])
70+ fi 71+ fi
71+ done 72+ done
72+ LIB_STANDARD="$crt_gcc_subdir/crtend.o $LIB_STANDARD" 73+ LIB_STANDARD="$crt_gcc_subdir/crtend.o $LIB_STANDARD"
73+ START_FILES="$START_FILES $crt_gcc_subdir/crtbegin.o" 74+ START_FILES="$START_FILES $crt_gcc_subdir/crtbegin.o"
74+ else 75+ else
75+ AC_MSG_WARN([Correct CRT file list unknown for ${CC}.]) 76+ AC_MSG_WARN([Correct CRT file list unknown for ${CC}.])
76+ fi  77+ fi
77+ ;; 78+ ;;
78 netbsd | openbsd ) 79 netbsd | openbsd )
79 if test -f $CRT_DIR/crti.o; then 80 if test -f $CRT_DIR/crti.o; then
80  81
81@@ -2834,7 +2869,7 @@ mail_lock=no 82@@ -2661,7 +2696,8 @@ if test "${HAVE_X11}" = "yes" && test "$
 83 AC_CHECK_HEADER(gif_lib.h,
 84 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 85 # Earlier versions can crash Emacs.
 86- [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])
 87+# EGifPutExtensionLast) has been deprecated in giflib 5.0.0 or later.
 88+ [AC_CHECK_LIB(gif, EGifPutExtensionTrailer, HAVE_GIF=yes, HAVE_GIF=maybe)])
 89
 90 if test "$HAVE_GIF" = yes; then
 91 LIBGIF=-lgif
 92@@ -2834,7 +2870,7 @@ mail_lock=no
82 case "$opsys" in 93 case "$opsys" in
83 aix4-2) mail_lock="lockf" ;; 94 aix4-2) mail_lock="lockf" ;;
84  95
85- gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; 96- gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
86+ gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; 97+ gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
87  98
88 ## On GNU/Linux systems, both methods are used by various mail programs. 99 ## On GNU/Linux systems, both methods are used by various mail programs.
89 ## I assume most people are using newer mailers that have heard of flock. 100 ## I assume most people are using newer mailers that have heard of flock.
90@@ -2988,6 +3023,11 @@ case "$opsys" in 101@@ -2988,6 +3024,11 @@ case "$opsys" in
91 ## option to use it. 102 ## option to use it.
92 darwin) LIBS_TERMCAP="-lncurses" ;; 103 darwin) LIBS_TERMCAP="-lncurses" ;;
93  104
94+ dragonfly) 105+ dragonfly)
95+ TERMINFO=yes 106+ TERMINFO=yes
96+ LIBS_TERMCAP="-lncurses" 107+ LIBS_TERMCAP="-lncurses"
97+ ;; 108+ ;;
98+ 109+
99 gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;; 110 gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;;
100  111
101 freebsd) 112 freebsd)
102@@ -3439,7 +3479,7 @@ case $opsys in 113@@ -3439,7 +3480,7 @@ case $opsys in
103 esac 114 esac
104  115
105 case $opsys in 116 case $opsys in
106- darwin | freebsd | netbsd | openbsd ) 117- darwin | freebsd | netbsd | openbsd )
107+ darwin | dragonfly | freebsd | netbsd | openbsd ) 118+ darwin | dragonfly | freebsd | netbsd | openbsd )
108 AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to 119 AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
109 close a pty to make it a controlling terminal (it is already a 120 close a pty to make it a controlling terminal (it is already a
110 controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).]) 121 controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
111@@ -3545,7 +3585,7 @@ case $opsys in 122@@ -3545,7 +3586,7 @@ case $opsys in
112 AC_DEFINE(FIRST_PTY_LETTER, ['p']) 123 AC_DEFINE(FIRST_PTY_LETTER, ['p'])
113 ;; 124 ;;
114  125
115- gnu-linux | gnu-kfreebsd | freebsd | netbsd ) 126- gnu-linux | gnu-kfreebsd | freebsd | netbsd )
116+ gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd ) 127+ gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
117 dnl if HAVE_GRANTPT 128 dnl if HAVE_GRANTPT
118 if test "x$ac_cv_func_grantpt" = xyes; then 129 if test "x$ac_cv_func_grantpt" = xyes; then
119 AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) 130 AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
120@@ -3628,7 +3668,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Mak 131@@ -3628,7 +3669,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Mak
121 case $opsys in 132 case $opsys in
122 dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX. 133 dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
123 dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX. 134 dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
124- aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin ) 135- aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
125+ aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin ) 136+ aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
126 AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1) 137 AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
127 ;; 138 ;;
128  139
129@@ -3725,6 +3765,10 @@ else dnl !ema 140@@ -3725,6 +3766,10 @@ else dnl !ema
130 AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_p - (FILE)->_bf._base)]) 141 AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_p - (FILE)->_bf._base)])
131 ;; 142 ;;
132  143
133+ dragonfly) 144+ dragonfly)
134+ AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [__fpending (FILE)]) 145+ AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [__fpending (FILE)])
135+ ;; 146+ ;;
136+ 147+
137 unixware) 148 unixware)
138 AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__ptr - (FILE)->__base)]) 149 AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__ptr - (FILE)->__base)])
139 ;; 150 ;;
140@@ -3782,7 +3826,7 @@ AH_TEMPLATE(TAB3, [Undocumented.]) 151@@ -3782,7 +3827,7 @@ AH_TEMPLATE(TAB3, [Undocumented.])
141 case $opsys in 152 case $opsys in
142 darwin) AC_DEFINE(TAB3, OXTABS) ;; 153 darwin) AC_DEFINE(TAB3, OXTABS) ;;
143  154
144- gnu | freebsd | netbsd | openbsd ) 155- gnu | freebsd | netbsd | openbsd )
145+ gnu | dragonfly | freebsd | netbsd | openbsd ) 156+ gnu | dragonfly | freebsd | netbsd | openbsd )
146 AC_DEFINE(TABDLY, OXTABS, [Undocumented.]) 157 AC_DEFINE(TABDLY, OXTABS, [Undocumented.])
147 AC_DEFINE(TAB3, OXTABS) 158 AC_DEFINE(TAB3, OXTABS)
148 ;; 159 ;;
149@@ -3859,7 +3903,7 @@ if test x$GCC = xyes; then 160@@ -3859,7 +3904,7 @@ if test x$GCC = xyes; then
150 else 161 else
151 case $opsys in 162 case $opsys in
152 dnl irix: Tested on Irix 6.5. SCM worked on earlier versions. 163 dnl irix: Tested on Irix 6.5. SCM worked on earlier versions.
153- freebsd | netbsd | openbsd | irix6-5 | sol2* ) 164- freebsd | netbsd | openbsd | irix6-5 | sol2* )
154+ dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* ) 165+ dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
155 AC_DEFINE(GC_SETJMP_WORKS, 1) 166 AC_DEFINE(GC_SETJMP_WORKS, 1)
156 ;; 167 ;;
157 esac 168 esac
158@@ -3959,7 +4003,7 @@ case $opsys in 169@@ -3959,7 +4004,7 @@ case $opsys in
159 AC_DEFINE(BSD_SYSTEM_AHB, 1, [Define if AH_BOTTOM should change BSD_SYSTEM.]) 170 AC_DEFINE(BSD_SYSTEM_AHB, 1, [Define if AH_BOTTOM should change BSD_SYSTEM.])
160 ;; 171 ;;
161  172
162- gnu | netbsd | openbsd ) 173- gnu | netbsd | openbsd )
163+ gnu | dragonfly | netbsd | openbsd ) 174+ gnu | dragonfly | netbsd | openbsd )
164 AC_DEFINE(BSD4_2, []) 175 AC_DEFINE(BSD4_2, [])
165 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ 176 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
166 #ifndef BSD_SYSTEM 177 #ifndef BSD_SYSTEM
167@@ -4415,7 +4459,7 @@ LIB_GCC= 178@@ -4415,7 +4460,7 @@ LIB_GCC=
168 if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then 179 if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
169  180
170 case "$opsys" in 181 case "$opsys" in
171- freebsd|netbsd|openbsd) LIB_GCC= ;; 182- freebsd|netbsd|openbsd) LIB_GCC= ;;
172+ dragonfly|freebsd|netbsd|openbsd) LIB_GCC= ;; 183+ dragonfly|freebsd|netbsd|openbsd) LIB_GCC= ;;
173  184
174 gnu-*) 185 gnu-*)
175 ## armin76@gentoo.org reported that the lgcc_s flag is necessary to 186 ## armin76@gentoo.org reported that the lgcc_s flag is necessary to
cvs diff -r1.7 -r1.8 pkgsrc/editors/emacs24/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/patches/Attic/patch-ab 2013/03/22 18:05:10 1.7
+++ pkgsrc/editors/emacs24/patches/Attic/patch-ab 2013/07/05 13:33:40 1.8
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-ab,v 1.7 2013/03/22 18:05:10 marino Exp $ 1$NetBSD: patch-ab,v 1.8 2013/07/05 13:33:40 ryoon Exp $
2 2
3Add DragonFly 3* Add DragonFly
 4* Fix giflib 5.0 build.
4 5
5--- configure.orig 2013-03-08 08:13:36.000000000 +0000 6--- configure.orig 2013-03-08 08:13:36.000000000 +0000
6+++ configure 7+++ configure
7@@ -4539,6 +4539,15 @@ case "${canonical}" in 8@@ -4539,6 +4539,15 @@ case "${canonical}" in
8 opsys=netbsd 9 opsys=netbsd
9 ;; 10 ;;
10  11
11+ ## DragonFly ports 12+ ## DragonFly ports
12+ *-*-dragonfly*) 13+ *-*-dragonfly*)
13+ opsys=dragonfly 14+ opsys=dragonfly
14+ case "${canonical}" in 15+ case "${canonical}" in
15+ i[3456]86-*-dragonfly*) machine=intel386 ;; 16+ i[3456]86-*-dragonfly*) machine=intel386 ;;
16+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 17+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
@@ -92,26 +93,51 @@ Add DragonFly @@ -92,26 +93,51 @@ Add DragonFly
92+ as_fn_error $? "Required file not found: $f" "$LINENO" 5 93+ as_fn_error $? "Required file not found: $f" "$LINENO" 5
93+ fi 94+ fi
94+ done 95+ done
95+ LIB_STANDARD="$crt_gcc_subdir/crtend.o $LIB_STANDARD" 96+ LIB_STANDARD="$crt_gcc_subdir/crtend.o $LIB_STANDARD"
96+ START_FILES="$START_FILES $crt_gcc_subdir/crtbegin.o" 97+ START_FILES="$START_FILES $crt_gcc_subdir/crtbegin.o"
97+ else 98+ else
98+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Correct CRT file list unknown for ${CC}." >&5 99+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Correct CRT file list unknown for ${CC}." >&5
99+$as_echo "$as_me: WARNING: Correct CRT file list unknown for ${CC}." >&2;} 100+$as_echo "$as_me: WARNING: Correct CRT file list unknown for ${CC}." >&2;}
100+ fi 101+ fi
101+ ;; 102+ ;;
102 netbsd | openbsd ) 103 netbsd | openbsd )
103 if test -f $CRT_DIR/crti.o; then 104 if test -f $CRT_DIR/crti.o; then
104  105
 106@@ -12766,8 +12825,8 @@ if test "${HAVE_X11}" = "yes" && test "$
 107 if test "x$ac_cv_header_gif_lib_h" = xyes; then :
 108 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 109 # Earlier versions can crash Emacs.
 110- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
 111-$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
 112+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionTrailer in -lgif" >&5
 113+$as_echo_n "checking for EGifPutExtensionTrailer in -lgif... " >&6; }
 114 if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
 115 $as_echo_n "(cached) " >&6
 116 else
 117@@ -12782,11 +12841,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 118 #ifdef __cplusplus
 119 extern "C"
 120 #endif
 121-char EGifPutExtensionLast ();
 122+char EGifPutExtensionTrailer ();
 123 int
 124 main ()
 125 {
 126-return EGifPutExtensionLast ();
 127+return EGifPutExtensionTrailer ();
 128 ;
 129 return 0;
 130 }
105@@ -13404,7 +13463,7 @@ mail_lock=no 131@@ -13404,7 +13463,7 @@ mail_lock=no
106 case "$opsys" in 132 case "$opsys" in
107 aix4-2) mail_lock="lockf" ;; 133 aix4-2) mail_lock="lockf" ;;
108  134
109- gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; 135- gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
110+ gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; 136+ gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
111  137
112 ## On GNU/Linux systems, both methods are used by various mail programs. 138 ## On GNU/Linux systems, both methods are used by various mail programs.
113 ## I assume most people are using newer mailers that have heard of flock. 139 ## I assume most people are using newer mailers that have heard of flock.
114@@ -13770,6 +13829,11 @@ case "$opsys" in 140@@ -13770,6 +13829,11 @@ case "$opsys" in
115 ## option to use it. 141 ## option to use it.
116 darwin) LIBS_TERMCAP="-lncurses" ;; 142 darwin) LIBS_TERMCAP="-lncurses" ;;
117  143
File Added: pkgsrc/editors/emacs24/patches/Attic/patch-src_image.c
$NetBSD: patch-src_image.c,v 1.1 2013/07/05 13:33:40 ryoon Exp $

* Fix build with giflib 5.0.

--- 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 
 	}
 
       /* Open the GIF file.  */
-      gif = fn_DGifOpenFileName (SSDATA (file));
+      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
       if (gif == NULL)
 	{
 	  image_error ("Cannot open `%s'", file, Qnil);
@@ -7213,7 +7213,7 @@ gif_load (struct frame *f, struct image 
       memsrc.len = SBYTES (specified_data);
       memsrc.index = 0;
 
-      gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
+      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
       if (!gif)
 	{
 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);