[77938] trunk/dports/aqua/qt3-mac

[rowue at macports.org]

Revision: 77938
          http://trac.macports.org/changeset/77938
Author:   rowue at macports.org
Date:     2011-04-17 12:34:13 -0700 (Sun, 17 Apr 2011)
Log Message:
-----------
Fix for libpng issue - see #28544

Modified Paths:
--------------
    trunk/dports/aqua/qt3-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt3-mac/files/patch-src-kernel_qpngio.cpp.diff

Modified: trunk/dports/aqua/qt3-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt3-mac/Portfile	2011-04-17 19:30:10 UTC (rev 77937)
+++ trunk/dports/aqua/qt3-mac/Portfile	2011-04-17 19:34:13 UTC (rev 77938)
@@ -4,7 +4,7 @@
 
 name			qt3-mac
 version			3.3.8b
-revision                1
+revision                2
 categories		aqua
 maintainers		blair openmaintainer
 description		Qt Tool Kit (Native Aqua Version)
@@ -72,6 +72,7 @@
 					patch-qmake_Makefile.unix.diff \
 					qt3-leopard.diff \
 					reinplace_support.diff \
+					patch-src-kernel_qpngio.cpp.diff \
 					dlcompat.diff
     configure.args-append -ldl
     post-patch {

Added: trunk/dports/aqua/qt3-mac/files/patch-src-kernel_qpngio.cpp.diff
===================================================================
--- trunk/dports/aqua/qt3-mac/files/patch-src-kernel_qpngio.cpp.diff	                        (rev 0)
+++ trunk/dports/aqua/qt3-mac/files/patch-src-kernel_qpngio.cpp.diff	2011-04-17 19:34:13 UTC (rev 77938)
@@ -0,0 +1,26 @@
+--- src/kernel/qpngio.cpp	2008-01-15 14:09:13.000000000 -0500
++++ src/kernel/qpngio.cpp	2010-05-13 01:22:17.295436061 -0400
+@@ -162,7 +162,11 @@
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
++#if PNG_LIBPNG_VER < 10400
+ 		const int g = info_ptr->trans_values.gray;
++#else
++		const int g = info_ptr->trans_color.gray;
++#endif
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -190,7 +194,11 @@
+ 		    info_ptr->palette[i].red,
+ 		    info_ptr->palette[i].green,
+ 		    info_ptr->palette[i].blue,
++#if PNG_LIBPNG_VER < 10400
+ 		    info_ptr->trans[i]
++#else
++		    info_ptr->trans_alpha[i]
++#endif
+ 		    )
+ 		);
+ 		i++;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110417/9731d144/attachment.html>