[Frugalware-git] imgrebuild: k3d-0.7.11.0-1-i686

Elentir elentir at frugalware.org
Sun May 30 21:03:23 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=2dd6dc742c334b9ece0a4c1bba12fdaa74438451

commit 2dd6dc742c334b9ece0a4c1bba12fdaa74438451
Author: Elentir <elentir at frugalware.org>
Date:   Sun May 30 20:58:14 2010 +0200

k3d-0.7.11.0-1-i686

* version bump
* (to lastest 0.7.* version, 0.8 needs newer boost)
* remove old patch and add new ones
* fix up2date

diff --git a/source/xapps-extra/k3d/FrugalBuild b/source/xapps-extra/k3d/FrugalBuild
index 663b78b..195c294 100644
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: Mcklaren <mcklaren at gmail.com>

pkgname=k3d
-pkgver=0.6.7.0
-pkgrel=8
+pkgver=0.7.11.0
+pkgrel=1
pkgdesc="A complete free-as-in-freedom 3D modeling, animation and rendering system."
depends=('gtkglext' 'imagemagick>=6.4.8_9' 'librsvg' 'gts' 'python>=2.6' 'openexr>=1.4.0a' 'libxml2' 'libsigc++2' \
'freetype2' 'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm>=2.16.0-2' 'pango' 'glibmm' 'libboost-mt>=1.37.0')
@@ -12,35 +12,25 @@ makedepends=('boost>=1.37.0')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet' 'force')
-_F_sourceforge_ext="-src.tar.bz2"
-Finclude sourceforge
-source=($source k3d-0.6.7.0-gcc43.patch  k3d-0.6.7.0-sigc2.patch k3d-0.6.7.0-gcc43-2.patch gcc44.patch)
+_F_sourceforge_ext=".tar.gz"
+## trick to fix up2date
+_F_sourceforge_name="$pkgname-source"
+Finclude sourceforge cmake
+source=($source \
+$pkgname-$pkgver-libpng14.patch \
+$pkgname-$pkgver-gcc45.patch \
+$pkgname-$pkgver-fix-potfiles.patch)
url="http://www.k-3d.org/"
-up2date="lynx -dump http://www.k-3d.org/wiki/Download|grep -om1 'k3d-\(.*\)-src.*.bz2'|sed 's/.*d-\(.*\)-.*/\1/'"
+sha1sums=('cef63043c7bd8d7a130689e9b53d1023280e2978' \
+          '068bb0671d608cdc59f556011491685725a56360' \
+          '30a406600c59becb6b7513fc99abda390ae82143' \
+          'c9d50079825db508deb612dd416223c5b98fe705')

-build()
-{
+build() {
Fcd
-	Fpatchall
-	Fsed 'boost_regex' 'boost_regex-mt' m4/k3d_with_external_boost.m4
-        Fsed 'boost_date_time' 'boost_date_time-mt' m4/k3d_with_external_boost.m4
-	Fsed 'K3D_BOOST_LIBS=.*' \
-		'K3D_BOOST_LIBS="-lboost_regex-mt -lboost_date_time-mt -lboost_filesystem-mt"' \
-			m4/k3d_with_external_boost.m4
-	Fautoreconf
-	Fconf  	\
-		--with-external-boost \
-		--with-nls \
-		--without-gnome --disable-gnome \
-		--enable-gnome=no --with-graphviz \
-		--with-libxml2
-	make || Fdie
-	Fmakeinstall
+	rm -f CMakeCache.txt || Fdie
+	Fsed "libpng12" "libpng14" cmake/modules/K3DFindPNG.cmake
+	CMake_build
}

-sha1sums=('9bcbdb6d8aa274baa7200e3c267f303fb61a733a' \
-          '9178895484cca2e745be9b563ea41d50778d2dce' \
-          '611a87069e6db77b5817e8c0226cf2b2dd990756' \
-          'b993a694925eeed1026a482e2924fe9e8ee0d933' \
-          '0999b5709947571e11254e07ad135a7926fde986')
# optimization OK
diff --git a/source/xapps-extra/k3d/gcc44.patch b/source/xapps-extra/k3d/gcc44.patch
deleted file mode 100644
index 76ad93e..0000000
--- a/source/xapps-extra/k3d/gcc44.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/k3dsdk/gzstream.cpp b/k3dsdk/gzstream.cpp
-index b72f43c..4d3b1f4 100644
---- a/k3dsdk/gzstream.cpp
-+++ b/k3dsdk/gzstream.cpp
-@@ -31,6 +31,7 @@
-
- #include <zlib.h>
- #include <string.h>
-+#include <stdio.h>
-
- namespace k3d
- {
-diff --git a/k3dsdk/path.cpp b/k3dsdk/path.cpp
-index 182f090..82bf386 100644
---- a/k3dsdk/path.cpp
-+++ b/k3dsdk/path.cpp
-@@ -35,6 +35,7 @@
- 	#include <dirent.h>
- 	#include <fcntl.h>
- 	#include <unistd.h>
-+	#include <stdio.h>
-
- #endif // !K3D_PLATFORM_WIN32
-
-diff --git a/modules/jpeg/jpegreader.cpp b/modules/jpeg/jpegreader.cpp
-index ef1dc35..cef5084 100644
---- a/modules/jpeg/jpegreader.cpp
-+++ b/modules/jpeg/jpegreader.cpp
-@@ -34,6 +34,7 @@ extern "C"
- {
-
- #include <jpeglib.h>
-+#include <stdio.h>
-
- } // extern "C"
-
diff --git a/source/xapps-extra/k3d/k3d-0.6.7.0-gcc43-2.patch b/source/xapps-extra/k3d/k3d-0.6.7.0-gcc43-2.patch
deleted file mode 100644
index a971a04..0000000
--- a/source/xapps-extra/k3d/k3d-0.6.7.0-gcc43-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur k3d-0.6.7.0/k3dsdk/xml.cpp k3d-0.6.7.0-p/k3dsdk/xml.cpp
---- k3d-0.6.7.0/k3dsdk/xml.cpp	2006-04-26 06:44:19.000000000 +0200
-+++ k3d-0.6.7.0-p/k3dsdk/xml.cpp	2008-04-06 05:47:01.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <iterator>
- #include <stack>
- #include <stdexcept>
-+#include <cstring>
-
- #if defined K3D_HAVE_EXPAT
-
diff --git a/source/xapps-extra/k3d/k3d-0.6.7.0-gcc43.patch b/source/xapps-extra/k3d/k3d-0.6.7.0-gcc43.patch
deleted file mode 100644
index 3079d56..0000000
--- a/source/xapps-extra/k3d/k3d-0.6.7.0-gcc43.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- k3d-0.6.7.0/renderjob/main.cpp~	2007-01-23 05:06:33.000000000 +0100
-+++ k3d-0.6.7.0/renderjob/main.cpp	2008-02-16 15:07:18.000000000 +0100
-@@ -31,6 +31,7 @@
-
- #include <iostream>
- #include <vector>
-+#include <algorithm>
-
- namespace
- {
---- k3d-0.6.7.0/hapy/src/Assert.cc~	2004-01-12 15:21:41.000000000 +0100
-+++ k3d-0.6.7.0/hapy/src/Assert.cc	2008-02-16 14:10:50.000000000 +0100
-@@ -5,6 +5,7 @@
- #include <Hapy/IoStream.h>
-
- #include <cstring>
-+#include <cstdlib>
- #include <errno.h>
-
-
---- k3d-0.6.7.0/hapy/src/RuleId.cc~	2004-02-12 11:04:59.000000000 +0100
-+++ k3d-0.6.7.0/hapy/src/RuleId.cc	2008-02-16 14:11:57.000000000 +0100
-@@ -1,5 +1,7 @@
- /* Hapy is a public domain software. See Hapy README file for the details. */
-
-+#include <limits>
-+
- #include <Hapy/Assert.h>
- #include <Hapy/RuleId.h>
- #include <Hapy/NumericLimits.h>
---- k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp~	2005-11-24 21:19:23.000000000 +0100
-+++ k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp	2008-02-16 15:10:39.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "jules_bloomenthal.h"
-
- #include <iostream>
-+#include <algorithm>
-
- // Number of iterations (convergence)
- const int RES = 10;
---- k3d-0.6.7.0/ngui/entry.h~	2006-06-17 21:05:48.000000000 +0200
-+++ k3d-0.6.7.0/ngui/entry.h	2008-02-16 14:46:05.000000000 +0100
-@@ -31,6 +31,8 @@
- #include <k3dsdk/iproperty.h>
- #include <k3dsdk/iwritable_property.h>
-
-+#include <memory>
-+
- namespace k3d { class istate_recorder; }
-
- namespace libk3dngui
---- k3d-0.6.7.0/ngui/angle_axis_control.h~	2006-06-17 21:05:47.000000000 +0200
-+++ k3d-0.6.7.0/ngui/angle_axis_control.h	2008-02-16 14:44:56.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <k3dsdk/algebra.h>
- #include <k3dsdk/signal_system.h>
-
-+#include <memory>
- #include <gtkmm/table.h>
-
- namespace Gtk { class Button; }
---- k3d-0.6.7.0/ngui/ui_component.h~	2006-06-17 21:05:51.000000000 +0200
-+++ k3d-0.6.7.0/ngui/ui_component.h	2008-02-16 14:49:23.000000000 +0100
-@@ -22,6 +22,8 @@
-
- #include <k3dsdk/command_node.h>
-
-+#include <memory>
-+
- namespace Glib { class ustring; }
- namespace Gtk { class Tooltips; }
-
---- k3d-0.6.7.0/ngui/bitmap_preview.h~	2006-07-05 06:49:43.000000000 +0200
-+++ k3d-0.6.7.0/ngui/bitmap_preview.h	2008-02-16 14:47:25.000000000 +0100
-@@ -31,6 +31,8 @@
-
- #include <gtkmm/buttonbox.h>
-
-+#include <memory>
-+
- namespace Gtk { class Image; }
- namespace k3d { class idag; }
- namespace k3d { class iproperty; }
---- k3d-0.6.7.0/ngui/bounding_box.h~	2006-06-17 21:05:47.000000000 +0200
-+++ k3d-0.6.7.0/ngui/bounding_box.h	2008-02-16 14:48:10.000000000 +0100
-@@ -31,6 +31,8 @@
-
- #include <gtkmm/table.h>
-
-+#include <memory>
-+
- // Forward declarations
- namespace Gtk { class Button; }
- namespace k3d { class iproperty; }
---- k3d-0.6.7.0/modules/bitmap/bitmap_element.h~	2006-08-05 06:25:11.000000000 +0200
-+++ k3d-0.6.7.0/modules/bitmap/bitmap_element.h	2008-02-16 15:16:05.000000000 +0100
-@@ -27,6 +27,8 @@
- #include <k3dsdk/algebra.h>
- #include <k3dsdk/bitmap.h>
-
-+#include <memory>
-+
- namespace libk3dbitmap
- {
-
---- k3d-0.6.7.0/k3dsdk/log_control.h~	2007-01-06 20:58:14.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/log_control.h	2008-02-16 14:28:27.000000000 +0100
-@@ -22,6 +22,8 @@
-
- #include "signal_system.h"
-
-+#include <cstdlib>
-+
- namespace k3d
- {
-
---- k3d-0.6.7.0/k3dsdk/log.cpp~	2007-01-12 07:10:05.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/log.cpp	2008-02-16 14:23:23.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <iostream>
- #include <sstream>
- #include <vector>
-+#include <cstdlib>
-
- #ifdef K3D_PLATFORM_WIN32
-
---- k3d-0.6.7.0/k3dsdk/algebra.h~	2006-03-16 16:23:14.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/algebra.h	2008-02-16 14:14:05.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "vectors.h"
-
- #include <cfloat>
-+#include <cstring>
-
- /****************************************************************
- *
---- k3d-0.6.7.0/k3dsdk/socket.cpp~	2006-10-06 06:24:56.000000000 +0200
-+++ k3d-0.6.7.0/k3dsdk/socket.cpp	2008-02-16 14:34:30.000000000 +0100
-@@ -24,6 +24,7 @@
- #include "result.h"
- #include "socket.h"
- #include "string_cast.h"
-+#include <cstring>
-
- #ifdef K3D_PLATFORM_WIN32
-
---- k3d-0.6.7.0/k3dsdk/gl_info.cpp~	2004-12-19 01:39:24.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/gl_info.cpp	2008-02-16 14:19:37.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <iostream>
- #include <sstream>
- #include <string>
-+#include <cstring>
-
- namespace k3d
- {
---- k3d-0.6.7.0/k3dsdk/explicit_snap_target.cpp~	2006-02-15 03:31:06.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/explicit_snap_target.cpp	2008-02-16 14:16:47.000000000 +0100
-@@ -25,6 +25,8 @@
- #include "result.h"
- #include "vectors.h"
-
-+#include <algorithm>
-+
- namespace k3d
- {
-
---- k3d-0.6.7.0/k3dsdk/explicit_snap_source.cpp~	2006-02-15 03:31:06.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/explicit_snap_source.cpp	2008-02-16 14:16:13.000000000 +0100
-@@ -25,6 +25,8 @@
- #include "result.h"
- #include "vectors.h"
-
-+#include <algorithm>
-+
- namespace k3d
- {
-
---- k3d-0.6.7.0/k3dsdk/bitmap.h~	2006-08-05 06:22:03.000000000 +0200
-+++ k3d-0.6.7.0/k3dsdk/bitmap.h	2008-02-16 15:19:38.000000000 +0100
-@@ -31,7 +31,7 @@
- #include <cmath>
- #include <functional>
- #include <iostream>
--#include <string>
-+#include <cstring>
-
- namespace k3d
- {
diff --git a/source/xapps-extra/k3d/k3d-0.6.7.0-sigc2.patch b/source/xapps-extra/k3d/k3d-0.6.7.0-sigc2.patch
deleted file mode 100644
index be0b8f1..0000000
--- a/source/xapps-extra/k3d/k3d-0.6.7.0-sigc2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- k3d-0.6.7.0/k3dsdk/node.cpp~	2006-05-31 22:27:27.000000000 +0200
-+++ k3d-0.6.7.0/k3dsdk/node.cpp	2008-04-01 11:32:56.000000000 +0200
-@@ -26,6 +26,7 @@
- #include "iplugin_factory.h"
- #include "node.h"
-
-+#include <sigc++/sigc++.h>
- #include <algorithm>
- #include <iostream>
-
---- k3d-0.6.7.0/k3dsdk/mesh_modifier.h~	2006-02-19 06:43:39.000000000 +0100
-+++ k3d-0.6.7.0/k3dsdk/mesh_modifier.h	2008-04-01 11:32:52.000000000 +0200
-@@ -27,6 +27,8 @@
- #include "imesh_source.h"
- #include "mesh.h"
-
-+#include <sigc++/sigc++.h>
-+
- namespace k3d
- {
-
diff --git a/source/xapps-extra/k3d/k3d-0.7.11.0-fix-potfiles.patch b/source/xapps-extra/k3d/k3d-0.7.11.0-fix-potfiles.patch
new file mode 100644
index 0000000..fcba656
--- /dev/null
+++ b/source/xapps-extra/k3d/k3d-0.7.11.0-fix-potfiles.patch
@@ -0,0 +1,19 @@
+--- a/po/POTFILES.in	2009-03-20 05:29:03.000000000 +0900
++++ b/po/POTFILES.in	2009-03-21 16:58:26.811108311 +0900
+@@ -217,7 +217,6 @@
+ modules/mesh/merge_collinear_edges.cpp
+ modules/mesh/merge_coplanar_faces.cpp
+ modules/mesh/merge_mesh.cpp
+-modules/mesh/mesh_stats.cpp
+ modules/mesh/move_first_edge.cpp
+ modules/mesh/sds_corner.cpp
+ modules/mesh/sds_crease.cpp
+@@ -531,3 +530,7 @@
+ uimodules/qtui/user_interface.cpp
+ k3dsdk/mesh_writer.h
+ modules/ply_io/mesh_writer.cpp
++modules/lipsync/papagayo_lipsync_reader.cpp
++modules/named_arrays/named_text_array.cpp
++modules/ngui_python_shell/dialog.cpp
++modules/xtrackcad/document_importer.cpp
+
diff --git a/source/xapps-extra/k3d/k3d-0.7.11.0-gcc45.patch b/source/xapps-extra/k3d/k3d-0.7.11.0-gcc45.patch
new file mode 100644
index 0000000..6917170
--- /dev/null
+++ b/source/xapps-extra/k3d/k3d-0.7.11.0-gcc45.patch
@@ -0,0 +1,60 @@
+--- k3d-source-0.7.11.0/k3dsdk/gzstream.cpp~	2009-03-19 21:28:50.000000000 +0100
++++ k3d-source-0.7.11.0/k3dsdk/gzstream.cpp	2009-03-22 22:19:03.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include "gzstream.h"
+ #include "path.h"
+
++#include <stdio.h>
+ #include <zlib.h>
+ #include <string.h>
+
+--- k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp~	2009-03-19 21:28:53.000000000 +0100
++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp	2009-03-22 22:33:45.000000000 +0100
+@@ -70,7 +70,7 @@
+ template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
+     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
+     typedef typename ColorBase::template kth_element_reference_type<semantic_index>::type type;
+-    static type       get(ColorBase& cb) { return at_c<semantic_index>(cb); }
++    static type       get(ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); }
+ };
+
+ /// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
+@@ -78,7 +78,7 @@
+ template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
+     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
+     typedef typename ColorBase::template kth_element_const_reference_type<semantic_index>::type type;
+-    static type       get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
++    static type       get(const ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); }
+ };
+
+ /// \brief A mutable accessor to the K-th semantic element of a color base
+--- k3d-source-0.7.11.0/k3dsdk/path.cpp~	2009-03-19 21:28:55.000000000 +0100
++++ k3d-source-0.7.11.0/k3dsdk/path.cpp	2009-03-22 22:48:31.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include "result.h"
+ #include "system.h"
+
++#include <stdio.h>
+ #include <glibmm/convert.h>
+
+ #ifdef K3D_API_WIN32
+--- k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp~	2009-03-19 21:29:01.000000000 +0100
++++ k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp	2009-03-22 23:16:31.000000000 +0100
+@@ -20,6 +20,7 @@
+  */
+
+
++#include <stdio.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+--- k3d-source-0.7.11.0/modules/pdiff/Metric.cpp~	2009-03-19 21:29:02.000000000 +0100
++++ k3d-source-0.7.11.0/modules/pdiff/Metric.cpp	2009-03-22 23:34:09.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include "RGBAImage.h"
+ #include "LPyramid.h"
+ #include <math.h>
++#include <stdio.h>
+
+ #ifndef M_PI
+ #define M_PI 3.14159265f
diff --git a/source/xapps-extra/k3d/k3d-0.7.11.0-libpng14.patch b/source/xapps-extra/k3d/k3d-0.7.11.0-libpng14.patch
new file mode 100644
index 0000000..6396ffc
--- /dev/null
+++ b/source/xapps-extra/k3d/k3d-0.7.11.0-libpng14.patch
@@ -0,0 +1,54 @@
+diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
+--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2009-03-19 22:28:53.000000000 +0200
++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-05-12 12:21:50.000000000 +0300
+@@ -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,NULL,NULL);
+             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, NULL);
+             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,NULL);
+     }
+     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);
++                     (int *) NULL, (int *) NULL);
+         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);
++                     (int *) NULL, (int *) NULL);
+         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,NULL);
+             io_error("png_write_initialize: fail to call png_create_info_struct()");
+         }
+         if (setjmp(png_jmpbuf(_png_ptr))) {


More information about the Frugalware-git mailing list