Fix build with png-1.5.

3 files changed, 40 insertions, 4 deletions

diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 1676233ead1..76e970dfb90 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2010/12/06 11:56:44 markd Exp $
+$NetBSD: distinfo,v 1.49 2011/02/06 23:59:36 wiz Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -9,7 +9,7 @@ Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
 SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
 RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
 Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
-SHA1 (patch-aa) = 78efadde329158d1e41f8a0c899055e265485234
+SHA1 (patch-aa) = 473df96704826d6d983db678d80ea1c56f5e27de
 SHA1 (patch-ab) = 1f07247cf1554215d5532114138bfa53c7a3db6d
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
@@ -20,3 +20,4 @@ SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
 SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
+SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
index d42caef4876..b277185c154 100644
--- a/misc/koffice/patches/patch-aa
+++ b/misc/koffice/patches/patch-aa
@@ -1,8 +1,29 @@
-$NetBSD: patch-aa,v 1.14 2010/06/20 16:46:24 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2011/02/06 23:59:37 wiz Exp $
+
+Fix build with png-1.5.
 
 --- filters/krita/png/kis_png_converter.cc.orig	2007-05-30 21:39:37.000000000 +0000
 +++ filters/krita/png/kis_png_converter.cc
-@@ -785,7 +785,7 @@ void KisPNGConverter::cancel()
+@@ -221,7 +221,8 @@ KisImageBuilder_Result KisPNGConverter::
+     bool hasalpha = (color_type == PNG_COLOR_TYPE_RGB_ALPHA || color_type == PNG_COLOR_TYPE_GRAY_ALPHA);
+     
+     // Read image profile
+-    png_charp profile_name, profile_data;
++    png_charp profile_name;
++    png_bytep profile_data;
+     int compression_type;
+     png_uint_32 proflen;
+     int number_of_passes = 1;
+@@ -627,7 +628,7 @@ KisImageBuilder_Result KisPNGConverter::
+         } else { // Profile
+             char* name = new char[(*it)->type().length()+1];
+             strcpy(name, (*it)->type().ascii());
+-            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
++            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (png_bytep)(*it)->annotation().data(), (*it) -> annotation() . size());
+         }
+         ++it;
+     }
+@@ -785,7 +786,7 @@ void KisPNGConverter::cancel()
  
  void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
  {
diff --git a/misc/koffice/patches/patch-filters_krita_png_kis__png__converter.h b/misc/koffice/patches/patch-filters_krita_png_kis__png__converter.h
new file mode 100644
index 00000000000..33d391a59b1
--- /dev/null
+++ b/misc/koffice/patches/patch-filters_krita_png_kis__png__converter.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-filters_krita_png_kis__png__converter.h,v 1.1 2011/02/06 23:59:37 wiz Exp $
+
+Fix build with png-1.5.
+
+--- filters/krita/png/kis_png_converter.h.orig	2007-05-30 21:39:37.000000000 +0000
++++ filters/krita/png/kis_png_converter.h
+@@ -21,6 +21,7 @@
+ #define _KIS_PNG_CONVERTER_H_
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include <qvaluevector.h>
+