[97412] trunk/dports/graphics/gdk-pixbuf

[ryandesign at macports.org]

Revision: 97412
          https://trac.macports.org/changeset/97412
Author:   ryandesign at macports.org
Date:     2012-09-05 00:42:12 -0700 (Wed, 05 Sep 2012)
Log Message:
-----------
gdk-pixbuf: fix build with libpng 1.5, thanks to pdl-linux (#35978)

Modified Paths:
--------------
    trunk/dports/graphics/gdk-pixbuf/Portfile

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

Modified: trunk/dports/graphics/gdk-pixbuf/Portfile
===================================================================
--- trunk/dports/graphics/gdk-pixbuf/Portfile	2012-09-05 07:20:51 UTC (rev 97411)
+++ trunk/dports/graphics/gdk-pixbuf/Portfile	2012-09-05 07:42:12 UTC (rev 97412)
@@ -29,7 +29,7 @@
 
 patchfiles	patch-Makefile.in.diff patch-configure.diff \
 		patch-ltmain.sh.diff patch-gdk-pixbuf-Makefile.in.diff \
-		patch-underquoting.diff
+		patch-underquoting.diff patch-libpng-1.5.diff
 
 configure.cflags-append "-L${prefix}/lib"
 configure.env		LIBS="-L${prefix}/lib"

Added: trunk/dports/graphics/gdk-pixbuf/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/graphics/gdk-pixbuf/files/patch-libpng-1.5.diff	                        (rev 0)
+++ trunk/dports/graphics/gdk-pixbuf/files/patch-libpng-1.5.diff	2012-09-05 07:42:12 UTC (rev 97412)
@@ -0,0 +1,29 @@
+--- gdk-pixbuf/io-png.c.orig	2001-01-24 21:59:23.000000000 +0100
++++ gdk-pixbuf/io-png.c	2012-02-11 01:07:05.677268364 +0100
+@@ -175,7 +175,7 @@
+ 		return NULL;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf)) {
++	if (setjmp (png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
+ 		return NULL;
+ 	}
+@@ -311,7 +311,7 @@
+                 return NULL;
+         }
+ 
+-	if (setjmp (lc->png_read_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(lc->png_read_ptr))) {
+ 		if (lc->png_info_ptr)
+ 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
+                 g_free(lc);
+@@ -366,7 +366,7 @@
+         lc->max_row_seen_in_chunk = -1;
+         
+         /* Invokes our callbacks as needed */
+-	if (setjmp (lc->png_read_ptr->jmpbuf)) {
++	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ 		return FALSE;
+ 	} else {
+ 		png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120905/1a4808c1/attachment.html>