cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Unbreak

Browse Source 
- No PORTREVISION bump

PR:		ports/169240
Submitted by:	WATANABE Kazuhiro <CQG00620@nifty.ne.jp>
Approved by:	maintainer (timeout,19 days)
This commit is contained in:
Michael Scheidell 2012-07-08 23:41:58 +00:00
parent 2889a91ebe
commit 0b4cec9764
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=300638
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
japanese/emacs-emcws/Makefile
View File

@ -30,8 +30,6 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_EMACS= yes
EMACS_PORT_NAME= emacs21
BROKEN= does not compile
CONFLICTS= emacs-19.* emacs-20.* emacs-22.* \
ja-emcws-20.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \

20
japanese/emacs-emcws/files/patch-src-xfns.c
View File

@ -1,5 +1,14 @@
--- src/xfns.c.orig 2002-12-06 18:05:35.000000000 +0100
+++ src/xfns.c 2010-03-30 06:35:54.000000000 +0200
+++ src/xfns.c 2012-05-02 19:50:40.000000000 +0200
@@ -8541,7 +8541,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);
}
@@ -8641,7 +8641,7 @@
/* Check PNG signature. */
@ -18,3 +27,12 @@
{
image_error ("Not a PNG image: `%s'", img->spec, Qnil);
UNGCPRO;
@@ -8699,7 +8699,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)