[99665] trunk/dports/gnome/sodipodi

[ryandesign at macports.org]

Revision: 99665
          https://trac.macports.org/changeset/99665
Author:   ryandesign at macports.org
Date:     2012-11-13 15:33:30 -0800 (Tue, 13 Nov 2012)
Log Message:
-----------
sodipodi: add libpng dependency and increase revision to rebuild with libpng 1.5; fix build with libpng 1.5 (#36979); rewrite master_sites to avoid redirects

Modified Paths:
--------------
    trunk/dports/gnome/sodipodi/Portfile

Added Paths:
-----------
    trunk/dports/gnome/sodipodi/files/patch-libpng-1.5.diff

Modified: trunk/dports/gnome/sodipodi/Portfile
===================================================================
--- trunk/dports/gnome/sodipodi/Portfile	2012-11-13 22:19:32 UTC (rev 99664)
+++ trunk/dports/gnome/sodipodi/Portfile	2012-11-13 23:33:30 UTC (rev 99665)
@@ -4,6 +4,7 @@
 
 name			sodipodi
 version			0.34
+revision		1
 description		Sodipodi is a vector-based drawing program.
 long_description	\
 	Sodipodi is a vector-based drawing program, like \
@@ -22,14 +23,18 @@
 categories		gnome graphics
 platforms		darwin 
 homepage		http://sourceforge.net/projects/sodipodi/
-master_sites	sourceforge
+master_sites	sourceforge:project/sodipodi/sodipodi/${version}
+
 checksums		md5 396cd78526e5a8102fd11114f45a70fe
 patchfiles		patch_arikkei-dict.c patch_arikkei-token.c patch_nr-pathops.c \
 				patch_arikkei-strlib.c patch_repr-io.c patch_action.c \
 				patch_Makefile.in patch_units.h patch_bezier-utils.c \
-				patch_configure
+				patch_configure patch-libpng-1.5.diff
+
 depends_build		port:pkgconfig
-depends_lib		port:libgnomeprintui
+depends_lib		port:libgnomeprintui \
+				port:libpng
+
 configure.args	\
 	mandir=${prefix}/share/man
 configure.optflags	-g -Os

Added: trunk/dports/gnome/sodipodi/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/gnome/sodipodi/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/gnome/sodipodi/files/patch-libpng-1.5.diff	2012-11-13 23:33:30 UTC (rev 99665)
@@ -0,0 +1,20 @@
+--- src/helper/png-write.c~	2004-02-09 20:01:16.000000000 +0100
++++ src/helper/png-write.c	2012-02-12 13:12:20.779162364 +0100
+@@ -282,7 +282,7 @@
+ 	/* Set error handling.  REQUIRED if you aren't supplying your own
+ 	 * error hadnling functions in the png_create_write_struct() call.
+ 	 */
+-	if (setjmp (png_ptr->jmpbuf)) {
++	if (setjmp (png_jmpbuf(png_ptr))) {
+ 		/* If we get here, we had a problem reading the file */
+ 		fclose (fp);
+ 		unlink (filename);
+@@ -370,7 +370,7 @@
+ 
+ 		h = MIN (height - r, 64);
+ 		n = get_rows ((const unsigned char **) row_pointers, r, h, data);
+-		if (!n) longjmp (png_ptr->jmpbuf, 1);
++		if (!n) longjmp (png_jmpbuf(png_ptr), 1);
+ 		png_write_rows (png_ptr, row_pointers, n);
+ 		r += n;
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121113/5b090fe0/attachment.html>