[97302] trunk/dports/graphics/plotutils

[ryandesign at macports.org]

Revision: 97302
          https://trac.macports.org/changeset/97302
Author:   ryandesign at macports.org
Date:     2012-09-02 21:32:15 -0700 (Sun, 02 Sep 2012)
Log Message:
-----------
plotutils: fix build with libpng 1.5, thanks to gentoo

Modified Paths:
--------------
    trunk/dports/graphics/plotutils/Portfile

Added Paths:
-----------
    trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff

Modified: trunk/dports/graphics/plotutils/Portfile
===================================================================
--- trunk/dports/graphics/plotutils/Portfile	2012-09-03 03:36:03 UTC (rev 97301)
+++ trunk/dports/graphics/plotutils/Portfile	2012-09-03 04:32:15 UTC (rev 97302)
@@ -27,7 +27,8 @@
 checksums           rmd160  2a32244eb20e00b82a0742dde7b690f688e82774 \
                     sha256  4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab
 
-patchfiles       patch-configure.ac.diff
+patchfiles       patch-configure.ac.diff \
+                 patch-libpng-1.5.diff
 
 use_autoreconf   yes
 

Added: trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/graphics/plotutils/files/patch-libpng-1.5.diff	2012-09-03 04:32:15 UTC (rev 97302)
@@ -0,0 +1,31 @@
+fix building with libpng-1.5
+
+--- libplot/z_write.c
++++ libplot/z_write.c
+@@ -164,7 +164,7 @@
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (png_jmpbuf (png_ptr))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf (png_ptr), 1);
+ }
+ 
+ static void 
+@@ -515,7 +515,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf (png_ptr), 1);
+ }
+ 
+ static void 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120902/35cc1ceb/attachment.html>