sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-05 21:00:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- use libgif

Browse source 
- fix build with pnng 1.5.10
This commit is contained in:
Dirk Meyer 2012-06-03 09:38:00 +00:00
parent 5c44bf4baf
commit 7ad7e64428
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=298069
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editors/emacs22/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= emacs PORTNAME= emacs
PORTVERSION= ${EMACS_VER} PORTVERSION= ${EMACS_VER}
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= editors ipv6 CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
@ -22,7 +22,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
.endif .endif
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \ tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \ gif.5:${PORTSDIR}/graphics/giflib \
png15:${PORTSDIR}/graphics/png png15:${PORTSDIR}/graphics/png
.endif .endif

32
editors/emacs22/files/patch-src-image.c
View file

@ -1,6 +1,6 @@
--- src/image.c.orig 2010-03-29 08:46:39.902587060 +0200 --- src/image.c.orig 2008-08-26 00:18:33.000000000 +0200
+++ src/image.c 2010-03-29 08:51:40.907908128 +0200 +++ src/image.c 2012-06-03 11:17:01.000000000 +0200
@@ -5793,7 +5793,7 @@ @@ -6338,7 +6338,7 @@
/* PNG library details. */ /* PNG library details. */
DEF_IMGLIB_FN (png_get_io_ptr); DEF_IMGLIB_FN (png_get_io_ptr);
@ -9,7 +9,7 @@
DEF_IMGLIB_FN (png_create_read_struct); DEF_IMGLIB_FN (png_create_read_struct);
DEF_IMGLIB_FN (png_create_info_struct); DEF_IMGLIB_FN (png_create_info_struct);
DEF_IMGLIB_FN (png_destroy_read_struct); DEF_IMGLIB_FN (png_destroy_read_struct);
@@ -5824,7 +5824,7 @@ @@ -6369,7 +6369,7 @@
return 0; return 0;
LOAD_IMGLIB_FN (library, png_get_io_ptr); 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_read_struct);
LOAD_IMGLIB_FN (library, png_create_info_struct); LOAD_IMGLIB_FN (library, png_create_info_struct);
LOAD_IMGLIB_FN (library, png_destroy_read_struct); LOAD_IMGLIB_FN (library, png_destroy_read_struct);
@@ -5849,7 +5849,7 @@ @@ -6394,7 +6394,7 @@
#else #else
#define fn_png_get_io_ptr png_get_io_ptr #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_read_struct png_create_read_struct
#define fn_png_create_info_struct png_create_info_struct #define fn_png_create_info_struct png_create_info_struct
#define fn_png_destroy_read_struct png_destroy_read_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. */ /* Check PNG signature. */
if (fread (sig, 1, sizeof sig, fp) != sizeof sig if (fread (sig, 1, sizeof sig, fp) != sizeof sig
@ -36,7 +45,7 @@
{ {
image_error ("Not a PNG file: `%s'", file, Qnil); image_error ("Not a PNG file: `%s'", file, Qnil);
UNGCPRO; UNGCPRO;
@@ -6013,7 +6013,7 @@ @@ -6558,7 +6558,7 @@
/* Check PNG signature. */ /* Check PNG signature. */
if (tbr.len < sizeof sig if (tbr.len < sizeof sig
@ -45,3 +54,12 @@
{ {
image_error ("Not a PNG image: `%s'", img->spec, Qnil); image_error ("Not a PNG image: `%s'", img->spec, Qnil);
UNGCPRO; 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)