From CQG00620@nifty.ne.jp  Tue Jun 19 12:49:45 2012
Return-Path: <CQG00620@nifty.ne.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12EB61065670
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Jun 2012 12:49:45 +0000 (UTC)
	(envelope-from CQG00620@nifty.ne.jp)
Received: from mail2.asahi-net.or.jp (mail2.asahi-net.or.jp [202.224.39.198])
	by mx1.freebsd.org (Postfix) with ESMTP id D65E88FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Jun 2012 12:49:44 +0000 (UTC)
Received: from capricorn.sign.local.asahi-net.jp (i218178.dynamic.ppp.asahi-net.or.jp [61.125.218.178])
	by mail2.asahi-net.or.jp (Postfix) with ESMTP id E6BD71411B3
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Jun 2012 21:49:43 +0900 (JST)
Message-Id: <20120619124943.E6BD71411B3@mail2.asahi-net.or.jp>
Date: Tue, 19 Jun 2012 21:49:43 +0900
From: WATANABE Kazuhiro <CQG00620@nifty.ne.jp>
Reply-To: WATANABE Kazuhiro <CQG00620@nifty.ne.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] japanese/emacs-emcws: Fix the BROKEN flag

>Number:         169240
>Category:       ports
>Synopsis:       [patch] japanese/emacs-emcws: Fix the BROKEN flag
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 19 12:50:10 UTC 2012
>Closed-Date:    Sun Jul 08 23:42:10 UTC 2012
>Last-Modified:  Sun Jul  8 23:50:07 UTC 2012
>Originator:     WATANABE Kazuhiro
>Release:        FreeBSD 9.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD capricorn.sign.local 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #3 r237003M: Wed Jun 13 19:05:59 JST 2012 nabe@capricorn:/FreeBSD/obj/i386/releng_9.0/FreeBSD/releng_9.0/src/sys/GENERIC i386
>Description:
More fix is needed for this port to fit graphics/png 1.5.10.
This patch are obtained from editors/emacs21.  Thanks!
>How-To-Repeat:
# cd /usr/ports/japanese/emacs-emcws
# make TRYBROKEN=yes
(snip)
cc -c -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib   -Demacs -DHAVE_CONFIG_H -DUSE_LUCID  -I. -I/FreeBSD/ports/japanese/emacs-emcws/work/emacs-21.3/src -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib -I/usr/local/include -I/usr/local/include/wnn7/wnn -I/usr/local/include -O2 -pipe -fno-strict-aliasing xfns.c
xfns.c: In function 'my_png_error':
xfns.c:8544: error: dereferencing pointer to incomplete type
xfns.c: In function 'png_load':
xfns.c:8702: error: dereferencing pointer to incomplete type
gmake: *** [xfns.o] Error 1
*** Error code 2

Stop in /FreeBSD/ports/japanese/emacs-emcws.
*** Error code 1

Stop in /FreeBSD/ports/japanese/emacs-emcws.
# 
>Fix:
diff -urN emacs-emcws.orig/files/patch-src-xfns.c emacs-emcws/files/patch-src-xfns.c
--- emacs-emcws.orig/files/patch-src-xfns.c	2010-03-30 13:47:26.000000000 +0900
+++ emacs-emcws/files/patch-src-xfns.c	2012-06-19 17:02:46.000000000 +0900
@@ -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)
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jun 19 12:50:21 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169240 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: nakaji@jp.freebsd.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/169240: [patch] japanese/emacs-emcws: Fix the BROKEN flag
Date: Tue, 19 Jun 2012 12:50:18 UT

 Maintainer of japanese/emacs-emcws,
 
 Please note that PR ports/169240 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169240
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Sun Jul 8 23:05:03 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169240 
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Sun Jul 8 23:42:09 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169240 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169240: commit references a PR
Date: Sun,  8 Jul 2012 23:42:10 +0000 (UTC)

 scheidell    2012-07-08 23:41:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     japanese/emacs-emcws Makefile 
     japanese/emacs-emcws/files patch-src-xfns.c 
   Log:
   - Unbreak
   - No PORTREVISION bump
   
   PR:             ports/169240
   Submitted by:   WATANABE Kazuhiro <CQG00620@nifty.ne.jp>
   Approved by:    maintainer (timeout,19 days)
   
   Revision  Changes    Path
   1.53      +0 -2      ports/japanese/emacs-emcws/Makefile
   1.2       +19 -1     ports/japanese/emacs-emcws/files/patch-src-xfns.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
