[k3d] Add k3d-0.8.0.2-libpng1.4.patch (Work-around libpng-1.4 incompatibilities). Rebuild for libpng-1.4.

[corsepiu]

commit 651da44f7a990f7b12b3d2553e8c559dc44bb55b
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Nov 28 15:17:45 2011 +0100

    Add k3d-0.8.0.2-libpng1.4.patch (Work-around libpng-1.4 incompatibilities).
    Rebuild for libpng-1.4.

 k3d-0.8.0.2-libpng1.4.patch |   54 +++++++++++++++++++++++++++++++++++++++++++
 k3d.spec                    |    8 +++++-
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/k3d-0.8.0.2-libpng1.4.patch b/k3d-0.8.0.2-libpng1.4.patch
new file mode 100644
index 0000000..0e17b25
--- /dev/null
+++ b/k3d-0.8.0.2-libpng1.4.patch
@@ -0,0 +1,54 @@
+diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
+--- k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-07-03 04:27:47.000000000 +0200
++++ k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2011-11-28 14:52:49.270620085 +0100
+@@ -148,12 +148,12 @@
+         // allocate/initialize the image information data
+         _info_ptr = png_create_info_struct(_png_ptr);
+         if (_info_ptr == NULL) {
+-            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
++            png_destroy_read_struct(&_png_ptr,0,0);
+             io_error("png_get_file_size: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {
+             //free all of the memory associated with the png_ptr and info_ptr
+-            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
++            png_destroy_read_struct(&_png_ptr, &_info_ptr,0);
+             io_error("png_get_file_size: fail to call setjmp()");
+         }
+         png_init_io(_png_ptr, get());
+@@ -165,7 +165,7 @@
+     png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
+ 
+     ~png_reader() {
+-        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
++        png_destroy_read_struct(&_png_ptr,&_info_ptr,0);
+     }
+     point2<std::ptrdiff_t> get_dimensions() {
+         return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
+@@ -177,7 +177,7 @@
+         int bit_depth, color_type, interlace_type;
+         png_get_IHDR(_png_ptr, _info_ptr,
+                      &width, &height,&bit_depth,&color_type,&interlace_type,
+-                     int_p_NULL, int_p_NULL);
++                     0, 0);
+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+                     "png_read_view: input view size does not match PNG file size");
+         
+@@ -219,7 +219,7 @@
+         int bit_depth, color_type, interlace_type;
+         png_get_IHDR(_png_ptr, _info_ptr,
+                      &width, &height,&bit_depth,&color_type,&interlace_type,
+-                     int_p_NULL, int_p_NULL);
++                     0, 0);
+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+                     "png_reader_color_convert::apply(): input view size does not match PNG file size");
+         switch (color_type) {
+@@ -308,7 +308,7 @@
+         io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
+         _info_ptr = png_create_info_struct(_png_ptr);
+         if (!_info_ptr) {
+-            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
++            png_destroy_write_struct(&_png_ptr,0);
+             io_error("png_write_initialize: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {
diff --git a/k3d.spec b/k3d.spec
index 902db25..e15c09f 100644
--- a/k3d.spec
+++ b/k3d.spec
@@ -1,6 +1,6 @@
 Name:           k3d
 Version:        0.8.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -12,6 +12,7 @@ Patch0:         k3d-0.8.0.2-gcc-4.6.diff
 Patch1:         k3d-0.8.0.2-cmake.diff
 # From http://slackbuilds.org/slackbuilds/13.37/graphics/k3d/k3d_gtkmm224.patch
 Patch2:         k3d-0.8.0.2-gtkmm2.24.diff
+Patch3:         k3d-0.8.0.2-libpng1.4.patch
 
 # This list is alpha sorted.
 BuildRequires:  boost-devel
@@ -89,6 +90,7 @@ rendering a model written by K-3D.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # binaries in source tarball
 rm tests/*.pyc
@@ -178,6 +180,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Nov 28 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.8.0.2-5
+- Add k3d-0.8.0.2-libpng1.4.patch (Work-around libpng-1.4 incompatibilities).
+- Rebuild for libpng-1.4.
+
 * Thu Jul 21 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.8.0.2-4
 - Rebuild for boost-1.47.