Fix build with png-1.5.

5 files changed, 48 insertions, 6 deletions

diff --git a/games/pingus/distinfo b/games/pingus/distinfo
index 29160a5c915..cca3b6b4e97 100644
--- a/games/pingus/distinfo
+++ b/games/pingus/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/01/19 19:47:59 kefren Exp $
+$NetBSD: distinfo,v 1.2 2011/01/20 23:41:02 wiz Exp $
 
 SHA1 (pingus-0.7.3.tar.bz2) = ca7fe5cea65fb3392d1e81056a879831925502f2
 RMD160 (pingus-0.7.3.tar.bz2) = 664d259a98a172d10480be9aa4ec87a424ecd6f1
 Size (pingus-0.7.3.tar.bz2) = 11127278 bytes
-SHA1 (patch-aa) = 32a40991e57918163c9b7c2c740dd29b08ccadef
+SHA1 (patch-aa) = 7df701ca791e01d7c6fbff558bca906f56fbb643
 SHA1 (patch-ab) = 2f897472e0c006e6fa325c17eda34b05d0ba6a01
+SHA1 (patch-ac) = 34f11e9ba2b259cee4d90f408c214bdbb34330a2
diff --git a/games/pingus/patches/patch-aa b/games/pingus/patches/patch-aa
index be299bb74d6..a3bef4eea4d 100644
--- a/games/pingus/patches/patch-aa
+++ b/games/pingus/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/01/19 19:47:59 kefren Exp $
+$NetBSD: patch-aa,v 1.2 2011/01/20 23:41:02 wiz Exp $
 
 NetBSD config & path fixes
 
@@ -43,8 +43,8 @@ NetBSD config & path fixes
  
 -    if not config.CheckLibWithHeader('png', 'png.h', 'c++'):
 -       fatal_error += "  * library 'png' not found\n"
-+    if not config.CheckLibWithHeader('png14', 'png.h', 'c++'):
-+       fatal_error += "  * library 'png14' not found\n"
++    if not config.CheckLibWithHeader('png15', 'png.h', 'c++'):
++       fatal_error += "  * library 'png15' not found\n"
  
      if config.CheckMyProgram('sdl-config'):
         env.ParseConfig('sdl-config  --cflags --libs')
diff --git a/games/pingus/patches/patch-ac b/games/pingus/patches/patch-ac
new file mode 100644
index 00000000000..9260a9bbad4
--- /dev/null
+++ b/games/pingus/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2011/01/20 23:41:02 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/screenshot.cpp.orig	2007-09-30 16:07:08.000000000 +0000
++++ src/screenshot.cpp
+@@ -159,7 +159,7 @@ Screenshot::save_png(const std::string& 
+       return;
+     }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+     {
+       // If we get here, we had a problem reading the file
+       fclose(fp);
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 856b6cc54f5..b12fbaa6dd9 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.33 2011/01/10 15:19:43 wiz Exp $
+$NetBSD: distinfo,v 1.34 2011/01/20 23:37:36 wiz Exp $
 
 SHA1 (digikam-1.6.0.tar.bz2) = 7daf9606468e5a9ada55fac3a68820703adac48e
 RMD160 (digikam-1.6.0.tar.bz2) = b277e96a95aca2b85e42bfd614542c389c394c52
 Size (digikam-1.6.0.tar.bz2) = 13243516 bytes
+SHA1 (patch-aa) = 92886333220bec9135bafd0be76820982a3c32c9
diff --git a/graphics/digikam/patches/patch-aa b/graphics/digikam/patches/patch-aa
new file mode 100644
index 00000000000..fb24d69dba9
--- /dev/null
+++ b/graphics/digikam/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.11 2011/01/20 23:37:36 wiz Exp $
+
+Fix build with png-1.5.
+
+--- libs/dimg/loaders/pngloader.cpp.orig	2010-11-22 17:47:36.000000000 +0000
++++ libs/dimg/loaders/pngloader.cpp
+@@ -494,7 +494,8 @@ bool PNGLoader::load(const QString& file
+ 
+     if (m_loadFlags & LoadICCData)
+     {
+-        png_charp   profile_name, profile_data=NULL;
++        png_charp   profile_name;
++        png_bytep   profile_data=NULL;
+         png_uint_32 profile_size;
+         int         compression_type;
+ 
+@@ -730,7 +731,7 @@ bool PNGLoader::save(const QString& file
+ 
+     if (!profile_rawdata.isEmpty())
+     {
+-        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
++        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (png_bytep)profile_rawdata.data(), profile_rawdata.size());
+     }
+ 
+     // -------------------------------------------------------------------