Fri Jul 5 13:43:44 2013 UTC ()
Bump PKGREVISION.

* Fix build for giflib 5.0.4.


(ryoon)
diff -r1.28 -r1.29 pkgsrc/editors/emacs21/Makefile
diff -r1.13 -r1.14 pkgsrc/editors/emacs21/distinfo
diff -r1.3 -r1.4 pkgsrc/editors/emacs21/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/editors/emacs21/patches/patch-ax
cvs diff -r1.28 -r1.29 pkgsrc/editors/emacs21/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/Makefile 2013/05/31 12:40:58 1.28
+++ pkgsrc/editors/emacs21/Makefile 2013/07/05 13:43:44 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2013/05/31 12:40:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.29 2013/07/05 13:43:44 ryoon Exp $
2 2
3PKGREVISION= 27 3PKGREVISION= 28
4CATEGORIES= editors 4CATEGORIES= editors
5 5
6CONFLICTS+= emacs21-nox11-[0-9]* 6CONFLICTS+= emacs21-nox11-[0-9]*
7 7
8USE_TOOLS+= imake 8USE_TOOLS+= imake
9 9
10.include "options.mk" 10.include "options.mk"
11 11
12.include "../../editors/emacs21/Makefile.common" 12.include "../../editors/emacs21/Makefile.common"
13 13
14.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/editors/emacs21/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/distinfo 2011/12/31 23:56:46 1.13
+++ pkgsrc/editors/emacs21/distinfo 2013/07/05 13:43:44 1.14
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1$NetBSD: distinfo,v 1.13 2011/12/31 23:56:46 dholland Exp $ 1$NetBSD: distinfo,v 1.14 2013/07/05 13:43:44 ryoon Exp $
2 2
3SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 3SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
4RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a 4RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
5Size (emacs-21.4a.tar.gz) = 20403483 bytes 5Size (emacs-21.4a.tar.gz) = 20403483 bytes
6SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5 6SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
7SHA1 (patch-ab) = 54970ba05aa5b638f1a4420c75d2e9bcdaba5acf 7SHA1 (patch-ab) = 0c3396736776fc2d267ab5fe24c3a1be05d64849
8SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a 8SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
9SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f 9SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
10SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55 10SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
11SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94 11SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94
12SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620 12SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
13SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714 13SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714
14SHA1 (patch-ai) = 20fb931d649a55ae7ee6eb27ec5ba7cc938db0f7 14SHA1 (patch-ai) = 20fb931d649a55ae7ee6eb27ec5ba7cc938db0f7
15SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7 15SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
16SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b 16SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
17SHA1 (patch-al) = 124356413e49d056d513d905b9e6afda28817be6 17SHA1 (patch-al) = 124356413e49d056d513d905b9e6afda28817be6
18SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91 18SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91
19SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76 19SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76
20SHA1 (patch-ao) = 6e57a5a12742a09c2365933f580717ded232cf51 20SHA1 (patch-ao) = 6e57a5a12742a09c2365933f580717ded232cf51
21SHA1 (patch-ap) = a2f0108a6aa7e0389cd629ade74ca00c31cb1034 21SHA1 (patch-ap) = a2f0108a6aa7e0389cd629ade74ca00c31cb1034
22SHA1 (patch-aq) = 5d040fa79de68ec4a673db93caf3a9434c22a029 22SHA1 (patch-aq) = 5d040fa79de68ec4a673db93caf3a9434c22a029
23SHA1 (patch-ar) = d681a5e6daef094da957f198ab1607dca95a306a 23SHA1 (patch-ar) = d681a5e6daef094da957f198ab1607dca95a306a
24SHA1 (patch-as) = 15ab1dcc2d6a445b119b7f2bb8a8331b4aa1fbd0 24SHA1 (patch-as) = 15ab1dcc2d6a445b119b7f2bb8a8331b4aa1fbd0
25SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c 25SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c
26SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb 26SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb
27SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263 27SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263
28SHA1 (patch-aw) = d7d9013734853a9542fd657f1b532d3c108f88e0 28SHA1 (patch-aw) = d7d9013734853a9542fd657f1b532d3c108f88e0
29SHA1 (patch-ax) = 183dd9f3339564f0884f38be22080b333d85f58d 29SHA1 (patch-ax) = 1b4abed8dca34f6148a5f0dd4b323e19e8c799b2
30SHA1 (patch-ay) = 82e4eb371be4dff891878973888c38ca53e9f326 30SHA1 (patch-ay) = 82e4eb371be4dff891878973888c38ca53e9f326
31SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b 31SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b
32SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25 32SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25
33SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2 33SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2
34SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb 34SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
35SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e 35SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
 36SHA1 (patch-src_Makefile.in) = cecef2516c4b9a4171926080a32826fad92ea077
36SHA1 (patch-src_alloc_c) = c9d2c7832b8b48835b81789f938540e3827f7cd8 37SHA1 (patch-src_alloc_c) = c9d2c7832b8b48835b81789f938540e3827f7cd8
37SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942 38SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs21/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/patches/patch-ab 2011/12/31 23:56:47 1.3
+++ pkgsrc/editors/emacs21/patches/patch-ab 2013/07/05 13:43:44 1.4
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1$NetBSD: patch-ab,v 1.3 2011/12/31 23:56:47 dholland Exp $ 1$NetBSD: patch-ab,v 1.4 2013/07/05 13:43:44 ryoon Exp $
2 2
3Caution: the extra cpp checking (the three hunks containing "Should be 3Caution: the extra cpp checking (the three hunks containing "Should be
4one line") is manually hacked and not reflected in configure.in; do 4one line") is manually hacked and not reflected in configure.in; do
5not regenerate configure with autoconf without merging it. This 5not regenerate configure with autoconf without merging it. This
6checking is required because somewhere between gcc 4.1 and 4.5 cpp 6checking is required because somewhere between gcc 4.1 and 4.5 cpp
7started doing regrettable things with backslash-escaped newlines. 7started doing regrettable things with backslash-escaped newlines.
8 8
 9* Fix build on NetBSD 6.99.23, gcc -E -traditional-cpp with native X
 10 results syntax error. Use -traditional-cpp for Makefile generation only.
 11
9--- configure.orig 2003-03-18 14:19:12.000000000 +0000 12--- configure.orig 2003-03-18 14:19:12.000000000 +0000
10+++ configure 13+++ configure
11@@ -822,9 +822,17 @@ case "${canonical}" in 14@@ -822,9 +822,17 @@ case "${canonical}" in
12 sparc*-*-netbsd*) machine=sparc ;; 15 sparc*-*-netbsd*) machine=sparc ;;
13 vax-*-netbsd*) machine=vax ;; 16 vax-*-netbsd*) machine=vax ;;
14 arm-*-netbsd*) machine=arm ;; 17 arm-*-netbsd*) machine=arm ;;
15+ x86_64-*-netbsd*) machine=amd64 ;; 18+ x86_64-*-netbsd*) machine=amd64 ;;
16+ hppa-*-netbsd*) machine=hp800 ;; 19+ hppa-*-netbsd*) machine=hp800 ;;
17+ shle-*-netbsd*) machine=sh3el ;; 20+ shle-*-netbsd*) machine=sh3el ;;
18 esac 21 esac
19 ;; 22 ;;
20  23
21+ ## Darwin / Mac OS X 24+ ## Darwin / Mac OS X
@@ -35,94 +38,147 @@ started doing regrettable things with ba @@ -35,94 +38,147 @@ started doing regrettable things with ba
35+ ;; 38+ ;;
36+ 39+
37 ## Altos 3068 40 ## Altos 3068
38 m68*-altos-sysv* ) 41 m68*-altos-sysv* )
39 machine=altos opsys=usg5-2 42 machine=altos opsys=usg5-2
40@@ -1659,6 +1671,7 @@ case "${canonical}" in 43@@ -1659,6 +1671,7 @@ case "${canonical}" in
41 *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; 44 *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
42 *-386bsd* ) opsys=386bsd ;; 45 *-386bsd* ) opsys=386bsd ;;
43 *-freebsd* ) opsys=freebsd ;; 46 *-freebsd* ) opsys=freebsd ;;
44+ *-dragonfly* ) opsys=dragonfly ;; 47+ *-dragonfly* ) opsys=dragonfly ;;
45 *-nextstep* ) opsys=nextstep ;; 48 *-nextstep* ) opsys=nextstep ;;
46 ## Otherwise, we'll fall through to the generic opsys code at the bottom. 49 ## Otherwise, we'll fall through to the generic opsys code at the bottom.
47 esac 50 esac
48@@ -2052,15 +2065,21 @@ else 51@@ -2052,15 +2065,20 @@ else
49 CPP="${CC-cc} -E" 52 CPP="${CC-cc} -E"
50 # On the NeXT, cc -E runs the code through the compiler's parser, 53 # On the NeXT, cc -E runs the code through the compiler's parser,
51 # not just through cpp. 54 # not just through cpp.
52+ # And, gcc 4.5? and up does not preserve escaped newlines, which is 55+ # And, gcc 4.5? and up does not preserve escaped newlines, which is
53+ # fatal for preprocessing makefiles. 56+ # fatal for preprocessing makefiles.
54 cat > conftest.$ac_ext <<EOF 57 cat > conftest.$ac_ext <<EOF
55 #line 2057 "configure" 58 #line 2057 "configure"
56 #include "confdefs.h" 59 #include "confdefs.h"
57 #include <assert.h> 60 #include <assert.h>
58 Syntax Error 61 Syntax Error
59+Should \\ 62+Should be one line.
60+be one line. 
61 EOF 63 EOF
62-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 64-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
63+ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" 65+ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
64 { (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 66 { (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
65-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 67-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
66+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ 68+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
67+ grep -L "Should *be one line" conftest2.out \ 69+ grep -L "Should *be one line" conftest2.out \
68+ ` 70+ `
69 if test -z "$ac_err"; then 71 if test -z "$ac_err"; then
70 : 72 :
71 else 73 else
72@@ -2074,10 +2093,14 @@ else 74@@ -2068,16 +2086,19 @@ else
 75 echo "configure: failed program was:" >&5
 76 cat conftest.$ac_ext >&5
 77 rm -rf conftest*
 78- CPP="${CC-cc} -E -traditional-cpp"
 79+ CPP="${CC-cc} -E"
 80 cat > conftest.$ac_ext <<EOF
 81 #line 2074 "configure"
73 #include "confdefs.h" 82 #include "confdefs.h"
74 #include <assert.h> 83 #include <assert.h>
75 Syntax Error 84 Syntax Error
76+Should \\ 85+Should be one line.
77+be one line. 
78 EOF 86 EOF
79-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 87-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
80+ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" 88+ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
81 { (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 89 { (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
82-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 90-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
83+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ 91+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
84+ grep -L "Should *be one line" conftest2.out \ 92+ grep -L "Should *be one line" conftest2.out \
85+ ` 93+ `
86 if test -z "$ac_err"; then 94 if test -z "$ac_err"; then
87 : 95 :
88 else 96 else
89@@ -2091,10 +2114,14 @@ else 97@@ -2091,10 +2112,13 @@ else
90 #include "confdefs.h" 98 #include "confdefs.h"
91 #include <assert.h> 99 #include <assert.h>
92 Syntax Error 100 Syntax Error
93+Should \\ 101+Should be one line.
94+be one line. 
95 EOF 102 EOF
96-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 103-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
97+ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" 104+ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
98 { (eval echo configure:2097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 105 { (eval echo configure:2097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
99-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 106-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
100+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ 107+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
101+ grep -L "Should *be one line" conftest2.out \ 108+ grep -L "Should *be one line" conftest2.out \
102+ ` 109+ `
103 if test -z "$ac_err"; then 110 if test -z "$ac_err"; then
104 : 111 :
105 else 112 else
106@@ -9124,6 +9151,22 @@ EOF 113@@ -5583,24 +5607,24 @@ if eval "test \"`echo '$ac_cv_header_'$a
 114 echo "$ac_t""yes" 1>&6
 115 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 116 # Earlier versions can crash Emacs.
 117- echo $ac_n "checking for EGifPutExtensionLast in -lungif""... $ac_c" 1>&6
 118-echo "configure:5588: checking for EGifPutExtensionLast in -lungif" >&5
 119-ac_lib_var=`echo ungif'_'EGifPutExtensionLast | sed 'y%./+-%__p_%'`
 120+ echo $ac_n "checking for EGifPutExtensionTrailer in -lgif""... $ac_c" 1>&6
 121+echo "configure:5588: checking for EGifPutExtensionTrailer in -lgif" >&5
 122+ac_lib_var=`echo ungif'_'EGifPutExtensionTrailer | sed 'y%./+-%__p_%'`
 123 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 124 echo $ac_n "(cached) $ac_c" 1>&6
 125 else
 126 ac_save_LIBS="$LIBS"
 127-LIBS="-lungif $LIBS"
 128+LIBS="-lgif $LIBS"
 129 cat > conftest.$ac_ext <<EOF
 130 #line 5596 "configure"
 131 #include "confdefs.h"
 132 /* Override any gcc2 internal prototype to avoid an error. */
 133 /* We use char because int might match the return type of a gcc2
 134 builtin and then its argument prototype would still apply. */
 135-char EGifPutExtensionLast();
 136+char EGifPutExtensionTrailer();
 137
 138 int main() {
 139-EGifPutExtensionLast()
 140+EGifPutExtensionTrailer()
 141 ; return 0; }
 142 EOF
 143 if { (eval echo configure:5607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 144@@ -9124,6 +9148,22 @@ EOF
107 fi 145 fi
108  146
109  147
110+# NETBSD: NetBSD's newer run-time linker fix. 148+# NETBSD: NetBSD's newer run-time linker fix.
111+if test $opsys = netbsd; then 149+if test $opsys = netbsd; then
112+ if test -f /usr/lib/crti.o; then 150+ if test -f /usr/lib/crti.o; then
113+ cat >> confdefs.h <<\EOF 151+ cat >> confdefs.h <<\EOF
114+#define HAVE_NETBSD_CRTI 1 152+#define HAVE_NETBSD_CRTI 1
115+EOF 153+EOF
116+ 154+
117+ fi 155+ fi
118+ if test -f /usr/lib/crtn.o; then 156+ if test -f /usr/lib/crtn.o; then
119+ cat >> confdefs.h <<\EOF 157+ cat >> confdefs.h <<\EOF
120+#define HAVE_NETBSD_CRTN 1 158+#define HAVE_NETBSD_CRTN 1
121+EOF 159+EOF
122+ 160+
123+ fi 161+ fi
124+fi 162+fi
125+ 163+
126 # Set up the CFLAGS for real compilation, so we can substitute it. 164 # Set up the CFLAGS for real compilation, so we can substitute it.
127 CFLAGS="$REAL_CFLAGS" 165 CFLAGS="$REAL_CFLAGS"
128 CPPFLAGS="$REAL_CPPFLAGS" 166 CPPFLAGS="$REAL_CPPFLAGS"
 167@@ -9735,7 +9777,7 @@ echo creating lib-src/Makefile
 168 sed -e '1,/start of cpp stuff/d'\
 169 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
 170 < Makefile.c > junk.c
 171- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 172+ $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 173 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
 174 cat junk1.c junk2.c > Makefile.new
 175 rm -f junk.c junk1.c junk2.c
 176@@ -9751,7 +9793,7 @@ echo creating src/Makefile
 177 sed -e '1,/start of cpp stuff/d'\
 178 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
 179 < Makefile.c > junk.c
 180- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 181+ $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 182 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
 183 cat junk1.c junk2.c > Makefile.new
 184 rm -f junk.c junk1.c junk2.c
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs21/patches/patch-ax (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/patches/patch-ax 2011/01/24 09:42:40 1.1
+++ pkgsrc/editors/emacs21/patches/patch-ax 2013/07/05 13:43:44 1.2
@@ -1,27 +1,46 @@ @@ -1,27 +1,46 @@
1$NetBSD: patch-ax,v 1.1 2011/01/24 09:42:40 wiz Exp $ 1$NetBSD: patch-ax,v 1.2 2013/07/05 13:43:44 ryoon Exp $
2 2
3Fix build with png-1.5. 3* Fix build with png-1.5.
 4* Fix build with giflib 5.0.
4 5
5--- src/xfns.c.orig 2002-12-06 17:05:35.000000000 +0000 6--- src/xfns.c.orig 2002-12-06 17:05:35.000000000 +0000
6+++ src/xfns.c 7+++ src/xfns.c
7@@ -8541,7 +8541,11 @@ my_png_error (png_ptr, msg) 8@@ -8541,7 +8541,11 @@ my_png_error (png_ptr, msg)
8 { 9 {
9 xassert (png_ptr != NULL); 10 xassert (png_ptr != NULL);
10 image_error ("PNG error: %s", build_string (msg), Qnil); 11 image_error ("PNG error: %s", build_string (msg), Qnil);
11+#if (PNG_LIBPNG_VER < 10500) 12+#if (PNG_LIBPNG_VER < 10500)
12 longjmp (png_ptr->jmpbuf, 1); 13 longjmp (png_ptr->jmpbuf, 1);
13+#else 14+#else
14+ png_longjmp (png_ptr, 1); 15+ png_longjmp (png_ptr, 1);
15+#endif 16+#endif
16 } 17 }
17  18
18  19
19@@ -8699,7 +8703,7 @@ png_load (f, img) 20@@ -8699,7 +8703,7 @@ png_load (f, img)
20  21
21 /* Set error jump-back. We come back here when the PNG library 22 /* Set error jump-back. We come back here when the PNG library
22 detects an error. */ 23 detects an error. */
23- if (setjmp (png_ptr->jmpbuf)) 24- if (setjmp (png_ptr->jmpbuf))
24+ if (setjmp (png_jmpbuf(png_ptr))) 25+ if (setjmp (png_jmpbuf(png_ptr)))
25 { 26 {
26 error: 27 error:
27 if (png_ptr) 28 if (png_ptr)
 29@@ -9759,7 +9763,7 @@ gif_load (f, img)
 30 }
 31
 32 /* Open the GIF file. */
 33- gif = DGifOpenFileName (XSTRING (file)->data);
 34+ gif = DGifOpenFileName (XSTRING (file)->data, NULL);
 35 if (gif == NULL)
 36 {
 37 image_error ("Cannot open `%s'", file, Qnil);
 38@@ -9775,7 +9779,7 @@ gif_load (f, img)
 39 memsrc.len = STRING_BYTES (XSTRING (specified_data));
 40 memsrc.index = 0;
 41
 42- gif = DGifOpen(&memsrc, gif_read_from_memory);
 43+ gif = DGifOpen(&memsrc, gif_read_from_memory, NULL);
 44 if (!gif)
 45 {
 46 image_error ("Cannot open memory source `%s'", img->spec, Qnil);