[98081] trunk/dports/science/swarm

ryandesign at macports.org ryandesign at macports.org
Mon Sep 24 07:38:40 PDT 2012


Revision: 98081
          http://trac.macports.org//changeset/98081
Author:   ryandesign at macports.org
Date:     2012-09-24 07:38:40 -0700 (Mon, 24 Sep 2012)
Log Message:
-----------
swarm: fix build with libpng 1.5

Modified Paths:
--------------
    trunk/dports/science/swarm/Portfile

Added Paths:
-----------
    trunk/dports/science/swarm/files/
    trunk/dports/science/swarm/files/patch-libpng-1.5.diff

Modified: trunk/dports/science/swarm/Portfile
===================================================================
--- trunk/dports/science/swarm/Portfile	2012-09-24 14:03:44 UTC (rev 98080)
+++ trunk/dports/science/swarm/Portfile	2012-09-24 14:38:40 UTC (rev 98081)
@@ -29,6 +29,8 @@
 
 universal_variant   no
 
+patchfiles          patch-libpng-1.5.diff
+
 post-patch {
     reinplace {s:-fgnu-runtime:-DH5_USE_16_API -fnested-functions -fgnu-runtime:g} \
         ${worksrcpath}/configure \

Added: trunk/dports/science/swarm/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/science/swarm/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/science/swarm/files/patch-libpng-1.5.diff	2012-09-24 14:38:40 UTC (rev 98081)
@@ -0,0 +1,22 @@
+--- src/tkobjc/Pixmap.m.orig	2003-06-22 10:57:34.000000000 -0500
++++ src/tkobjc/Pixmap.m	2012-09-24 09:18:26.000000000 -0500
+@@ -103,7 +103,7 @@
+       png_destroy_read_struct (&read_ptr, NULL, NULL);
+       raiseEvent (PixmapError, "Could not create PNG info struct");
+     }
+-  if (setjmp (read_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf (read_ptr)))
+     {
+       png_destroy_read_struct (&read_ptr, &read_info_ptr, (png_infopp)NULL);
+       fclose (fp);
+--- src/tkobjc/internal.m.orig	2007-06-17 01:15:30.000000000 -0500
++++ src/tkobjc/internal.m	2012-09-24 09:18:15.000000000 -0500
+@@ -1666,7 +1666,7 @@
+       raiseEvent (PixmapError, "Could not create PNG info struct\n");
+     }
+   
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf (png_ptr)))
+     {
+       png_destroy_write_struct (&png_ptr, &info_ptr);
+       fclose (fp);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120924/08e0047a/attachment.html>


More information about the macports-changes mailing list