[97409] trunk/dports/x11/grace

[ryandesign at macports.org]

Revision: 97409
          https://trac.macports.org/changeset/97409
Author:   ryandesign at macports.org
Date:     2012-09-04 22:07:58 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
grace: fix build failure with libpng 1.5 (#35948)

Modified Paths:
--------------
    trunk/dports/x11/grace/Portfile

Added Paths:
-----------
    trunk/dports/x11/grace/files/patch-libpng-1.5.diff

Modified: trunk/dports/x11/grace/Portfile
===================================================================
--- trunk/dports/x11/grace/Portfile	2012-09-05 03:32:37 UTC (rev 97408)
+++ trunk/dports/x11/grace/Portfile	2012-09-05 05:07:58 UTC (rev 97409)
@@ -35,7 +35,8 @@
 	port:zlib
 
 
-patchfiles          patch-configure.diff
+patchfiles          patch-configure.diff \
+                    patch-libpng-1.5.diff
 
 configure.pre_args  --prefix=${prefix}/lib
 configure.args      --with-helpviewer="open ${prefix}/share/doc/${name}/`basename %s`" \

Added: trunk/dports/x11/grace/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/x11/grace/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/x11/grace/files/patch-libpng-1.5.diff	2012-09-05 05:07:58 UTC (rev 97409)
@@ -0,0 +1,19 @@
+--- src/rstdrv.c.orig
++++ src/rstdrv.c
+@@ -54,6 +54,7 @@
+ 
+ #ifdef HAVE_LIBPNG
+ #  include <png.h>
++#  include <zlib.h>
+ #endif
+ 
+ #ifndef NONE_GUI
+@@ -885,7 +886,7 @@ static void rstImagePng(gdImagePtr ihandle, FILE *prstream)
+         return;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return;
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120904/06f89597/attachment.html>