- fix build for png-1.4.1

svn path=/head/; revision=251625

x11-toolkits/qt33/Makefile

@@ -44,8 +44,8 @@ CONFIGURE_ARGS+=-system-libpng -system-libjpeg -system-libmng	\
 		-fast -xinerama -no-g++-exceptions -stl -no-nis \
 		${CUPS} -shared -prefix ${PREFIX} -datadir ${DATADIR} \
 		-verbose -docdir ${DOCSDIR} -tablet -ipv6 \
+		-DPNG_DEPSTRUCT= \
 		-plugindir ${PREFIX}/lib/plugins
-
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	TMPDIR=${TMPDIR} \
 		QTDIR=${WRKSRC} \

x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp

@@ -0,0 +1,20 @@
+--- src/kernel/qpngio.cpp.orig	2007-02-02 15:01:15.000000000 +0100
++++ src/kernel/qpngio.cpp	2010-03-28 14:00:46.000000000 +0200
+@@ -159,7 +159,7 @@
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-		const int g = info_ptr->trans_values.gray;
++		const int g = info_ptr->trans_color.gray;
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ 		    info_ptr->palette[i].red,
+ 		    info_ptr->palette[i].green,
+ 		    info_ptr->palette[i].blue,
+-		    info_ptr->trans[i]
++		    info_ptr->trans_alpha[i]
+ 		    )
+ 		);
+ 		i++;