diff options
| author | dinoex <dinoex@FreeBSD.org> | 2012-06-03 17:38:00 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2012-06-03 17:38:00 +0800 |
| commit | 608e4c5a81714fe677fa6aef1f9f2ef05aea0a3e (patch) | |
| tree | 6aebc6a6f995028103270397207fb169fc05ea50 /editors | |
| parent | 31d4b41b5497c872f88c5a2d1dc209e700cc8d95 (diff) | |
| download | freebsd-ports-gnome-608e4c5a81714fe677fa6aef1f9f2ef05aea0a3e.tar.gz freebsd-ports-gnome-608e4c5a81714fe677fa6aef1f9f2ef05aea0a3e.tar.zst freebsd-ports-gnome-608e4c5a81714fe677fa6aef1f9f2ef05aea0a3e.zip | |
- use libgif
- fix build with pnng 1.5.10
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs22/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs22/files/patch-src-image.c | 32 |
2 files changed, 27 insertions, 9 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index b22eeaa848f1..ed71825ea16f 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -22,7 +22,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d .endif LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - ungif.5:${PORTSDIR}/graphics/libungif \ + gif.5:${PORTSDIR}/graphics/giflib \ png15:${PORTSDIR}/graphics/png .endif diff --git a/editors/emacs22/files/patch-src-image.c b/editors/emacs22/files/patch-src-image.c index 408d00ba8095..cf63c524c5a2 100644 --- a/editors/emacs22/files/patch-src-image.c +++ b/editors/emacs22/files/patch-src-image.c @@ -1,6 +1,6 @@ ---- src/image.c.orig 2010-03-29 08:46:39.902587060 +0200 -+++ src/image.c 2010-03-29 08:51:40.907908128 +0200 -@@ -5793,7 +5793,7 @@ +--- src/image.c.orig 2008-08-26 00:18:33.000000000 +0200 ++++ src/image.c 2012-06-03 11:17:01.000000000 +0200 +@@ -6338,7 +6338,7 @@ /* PNG library details. */ DEF_IMGLIB_FN (png_get_io_ptr); @@ -9,7 +9,7 @@ DEF_IMGLIB_FN (png_create_read_struct); DEF_IMGLIB_FN (png_create_info_struct); DEF_IMGLIB_FN (png_destroy_read_struct); -@@ -5824,7 +5824,7 @@ +@@ -6369,7 +6369,7 @@ return 0; LOAD_IMGLIB_FN (library, png_get_io_ptr); @@ -18,7 +18,7 @@ LOAD_IMGLIB_FN (library, png_create_read_struct); LOAD_IMGLIB_FN (library, png_create_info_struct); LOAD_IMGLIB_FN (library, png_destroy_read_struct); -@@ -5849,7 +5849,7 @@ +@@ -6394,7 +6394,7 @@ #else #define fn_png_get_io_ptr png_get_io_ptr @@ -27,7 +27,16 @@ #define fn_png_create_read_struct png_create_read_struct #define fn_png_create_info_struct png_create_info_struct #define fn_png_destroy_read_struct png_destroy_read_struct -@@ -5996,7 +5996,7 @@ +@@ -6427,7 +6427,7 @@ + { + xassert (png_ptr != NULL); + image_error ("PNG error: %s", build_string (msg), Qnil); +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_ptr), 1); + } + + +@@ -6541,7 +6541,7 @@ /* Check PNG signature. */ if (fread (sig, 1, sizeof sig, fp) != sizeof sig @@ -36,7 +45,7 @@ { image_error ("Not a PNG file: `%s'", file, Qnil); UNGCPRO; -@@ -6013,7 +6013,7 @@ +@@ -6558,7 +6558,7 @@ /* Check PNG signature. */ if (tbr.len < sizeof sig @@ -45,3 +54,12 @@ { image_error ("Not a PNG image: `%s'", img->spec, Qnil); UNGCPRO; +@@ -6603,7 +6603,7 @@ + + /* Set error jump-back. We come back here when the PNG library + detects an error. */ +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + error: + if (png_ptr) |