pkg/44386: png 1.5 support for editors/emacs22

[ryo_on%yk.rim.or.jp@localhost]

>Number:         44386
>Category:       pkg
>Synopsis:       png 1.5 support for editors/emacs22
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 14 09:00:00 +0000 2011
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.43
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.43 NetBSD 5.99.43 (LEAFGIRL2) 
#4: Thu Jan 13 09:27:17 JST 2011 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/LEAFGIRL2
 i386
Architecture: i386
Machine: i386
>Description:
png 1.5 breaks editors/emacs22 build.
The following patches will fix build.
        
>How-To-Repeat:
        
>Fix:
        
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs22/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo    24 Jun 2010 22:19:24 -0000      1.8
+++ distinfo    14 Jan 2011 08:54:27 -0000
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
-SHA1 (patch-af) = 0ed58bc8c5c7c15e1f17ceb39708ee4aeabe0c97
+SHA1 (patch-af) = 3f1a4f134b24bf9d99f0a2a5343a18c80ec3eaeb
 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
 SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
 SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs22/patches/patch-af,v
retrieving revision 1.1
diff -u -r1.1 patch-af
--- patches/patch-af    24 Jun 2010 22:19:24 -0000      1.1
+++ patches/patch-af    14 Jan 2011 08:54:27 -0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-af,v 1.1 2010/06/24 22:19:24 wiz Exp $
+$NetBSD$
 
-Workaround for systems coming with another copy of libpng (see PR 43485).
+* Workaround for systems coming with another copy of libpng (see PR 43485).
+* to support libpng 1.5.
 
 --- src/image.c.orig   2008-08-25 22:18:33.000000000 +0000
 +++ src/image.c
@@ -16,3 +17,21 @@
  
  #ifdef HAVE_NTGUI
  /* PNG library details.  */
+@@ -6427,7 +6423,7 @@ my_png_error (png_ptr, msg)
+ {
+   xassert (png_ptr != NULL);
+   image_error ("PNG error: %s", build_string (msg), Qnil);
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf(png_ptr), 1);
+ }
+ 
+ 
+@@ -6603,7 +6599,7 @@ png_load (f, img)
+ 
+   /* 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)


>Unformatted: