Improve png-1.5 patch. Bump PKGREVISION.

3 files changed, 14 insertions, 14 deletions

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 6f6f36f7bee..85d47936f6d 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2011/01/13 13:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2011/03/06 16:11:03 wiz Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
 PKGREVISION=	15
@@ -59,6 +59,7 @@ SUBST_SED.socklen=	-e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
+BUILDLINK_API_DEPENDS.png+=	png>=1.5.1
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index c27d654b6dc..897c3509b15 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2011/01/16 12:36:59 tnn Exp $
+$NetBSD: distinfo,v 1.55 2011/03/06 16:11:03 wiz Exp $
 
 SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7
 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4
@@ -21,7 +21,7 @@ SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3
 SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758
 SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d
 SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40
-SHA1 (patch-as) = b08e3ceabdc14d756e529386954e53e71ee2d299
+SHA1 (patch-as) = 0146d7da47795ac8835d93a48fb2f6e13212ff0f
 SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
diff --git a/x11/qt3-libs/patches/patch-as b/x11/qt3-libs/patches/patch-as
index a7d7e612c1b..42732b757c1 100644
--- a/x11/qt3-libs/patches/patch-as
+++ b/x11/qt3-libs/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.2 2011/01/16 12:36:59 tnn Exp $
+$NetBSD: patch-as,v 1.3 2011/03/06 16:11:03 wiz Exp $
 
 --- src/kernel/qpngio.cpp.orig	2007-02-02 14:01:15.000000000 +0000
 +++ src/kernel/qpngio.cpp
@@ -6,15 +6,15 @@ $NetBSD: patch-as,v 1.2 2011/01/16 12:36:59 tnn Exp $
      png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
  	0, 0, 0);
  
-+    png_colorp info_ptr_palette;
-+    int info_ptr_num_palette;
++    png_colorp info_ptr_palette = NULL;
++    int info_ptr_num_palette = 0;
 +    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
 +	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
 +    }
 +
-+    png_bytep info_ptr_trans_alpha;
-+    int info_ptr_num_trans;
-+    png_color_16p info_ptr_trans_color;
++    png_bytep info_ptr_trans_alpha = NULL;
++    int info_ptr_num_trans = 0;
++    png_color_16p info_ptr_trans_color = NULL;
 +
 +    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
 +	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
@@ -142,7 +142,7 @@ $NetBSD: patch-as,v 1.2 2011/01/16 12:36:59 tnn Exp $
  	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
  	int* trans = new int[num_palette];
  	int num_trans = 0;
-+        png_colorp info_ptr_palette;
++	png_colorp info_ptr_palette = NULL;
 +	int tmp;
 +	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
  	for (int i=0; i<num_palette; i++) {
@@ -194,17 +194,16 @@ $NetBSD: patch-as,v 1.2 2011/01/16 12:36:59 tnn Exp $
  	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
  	image = 0;
  	state = MovieStart;
-@@ -1117,7 +1147,8 @@ void QPNGFormat::end(png_structp png, pn
+@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
      consumer->frameDone(QPoint(offx,offy),r);
      consumer->end();
      state = FrameStart;
 -    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+#warning XXXtnn don't know how to fix this.
-+    unused_data = 0; /* (int)png->buffer_size; // Since libpng doesn't tell us */
++    unused_data = png_process_data_pause(png, 0);
  }
  
  #ifdef PNG_USER_CHUNKS_SUPPORTED
-@@ -1232,8 +1263,11 @@ void qInitPngIO()
+@@ -1232,8 +1262,11 @@ void qInitPngIO()
  
  void qt_zlib_compression_hack()
  {