graphics/k3d: Updated for version 0.8.0.5.

Fixes build failure with libsigc++-2.6.2.
New maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 19 insertions, 208 deletions

diff --git a/graphics/k3d/k3d.SlackBuild b/graphics/k3d/k3d.SlackBuild
index 0ac2c1b444eb9..7db26a38cd8aa 100644
--- a/graphics/k3d/k3d.SlackBuild
+++ b/graphics/k3d/k3d.SlackBuild
@@ -23,11 +23,11 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Revision date: 2012/09/14
+#
+# Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=k3d
-VERSION=${VERSION:-0.8.0.2}
+VERSION=${VERSION:-0.8.0.5}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
@@ -63,27 +63,19 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-source-$VERSION
-tar xvf $CWD/$PRGNAM-source-$VERSION.tar.bz2
-cd $PRGNAM-source-$VERSION
+# Upstream hasn't quite grokked how Github's tarballs work :(
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Patch code for new libpng
-patch -p1 < $CWD/png14.patch
-
-# Patch code for gtkmm-2.24
-patch -p1 < $CWD/k3d_gtkmm224.patch
-
-# Patch to build against gcc-4.7
-patch -p1 < $CWD/k3d_gcc47.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix man install directory.
-sed -i "s|share/man|man|" man/CMakeLists.txt
+sed -i "s|share/man|man|" share/man/CMakeLists.txt
 
 # Fix location of libraries for 64-bits
 sed -i "s|SET(K3D_LIBDIR lib)|SET(K3D_LIBDIR lib${LIBDIRSUFFIX})|" CMakeLists.txt
@@ -92,9 +84,8 @@ mkdir k3d-build
 cd k3d-build
   cmake -G "Unix Makefiles" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated-declarations" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DK3D_BUILD_SVG_IO_MODULE=ON \
     -DK3D_BUILD_CGAL_MODULE=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
diff --git a/graphics/k3d/k3d.info b/graphics/k3d/k3d.info
index 377691d30acda..afd41c446973f 100644
--- a/graphics/k3d/k3d.info
+++ b/graphics/k3d/k3d.info
@@ -1,10 +1,10 @@
 PRGNAM="k3d"
-VERSION="0.8.0.2"
+VERSION="0.8.0.5"
 HOMEPAGE="http://www.k-3d.org/"
-DOWNLOAD="http://downloads.sourceforge.net/k3d/k3d-source-0.8.0.2.tar.bz2"
-MD5SUM="9f4808b8d5e324f69b72ef1950df45d7"
+DOWNLOAD="https://github.com/K-3D/k3d/archive/k3d-0.8.0.5.tar.gz"
+MD5SUM="d5975b8b7933b47aaf4d9d8811723658"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtkglext"
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+REQUIRES="gtkglext ftgl"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/graphics/k3d/k3d_gcc47.patch b/graphics/k3d/k3d_gcc47.patch
deleted file mode 100644
index 56603d2d2b1b4..0000000000000
--- a/graphics/k3d/k3d_gcc47.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp	2010-07-02 23:27:47.000000000 -0300
-+++ k3d-source-0.8.0.2_patched/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp	2012-09-14 15:48:20.000000000 -0300
-@@ -114,7 +114,7 @@
-     template <typename T2, typename Op>

-     struct reduce_bind1 {

-         const T2& _t2;

--        mutable Op&  _op;

-+        Op&  _op;

- 

-         typedef typename Op::result_type result_type;

- 

-@@ -127,7 +127,7 @@
-     struct reduce_bind2 {

-         const Bits1& _bits1;

-         std::size_t _index1;

--        mutable Op&  _op;

-+        Op&  _op;

- 

-         typedef typename Op::result_type result_type;

- 

---- k3d-source-0.8.0.2/k3dsdk/data.h	2010-07-02 23:27:46.000000000 -0300
-+++ k3d-source-0.8.0.2_patched/k3dsdk/data.h	2012-09-14 16:50:20.000000000 -0300
-@@ -580,7 +580,7 @@
- 
- 		try
- 		{
--			set_value(boost::lexical_cast<value_t>(*new_value), Hint);
-+			this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
- 			return true;
- 		}
- 		catch(...)
-@@ -865,7 +865,7 @@
- 
- 		try
- 		{
--			set_value(boost::lexical_cast<value_t>(*new_value), Hint);
-+			this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
- 			return true;
- 		}
- 		catch(...)
-@@ -1011,7 +1011,7 @@
- 
- 		try
- 		{
--			set_value(boost::lexical_cast<value_t>(*new_value), Hint);
-+			this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
- 			return true;
- 		}
- 		catch(...)
-@@ -1146,7 +1146,7 @@
- 		if(!new_value)
- 			return false;
- 
--		set_value(*new_value, Hint);
-+		this->set_value(*new_value, Hint);
- 		return true;
- 	}
- 
-@@ -1671,7 +1671,7 @@
- 	/// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy
- 	void internal_set_value(const value_t& Value, ihint* const Hint)
- 	{
--		set_value(Value, Hint);
-+		this->set_value(Value, Hint);
- 	}
- };
- 
---- k3d-source-0.8.0.2/modules/animation/interpolator.h	2010-07-02 23:27:55.000000000 -0300
-+++ k3d-source-0.8.0.2_patched/modules/animation/interpolator.h	2012-09-14 16:45:16.000000000 -0300
-@@ -92,7 +92,7 @@
- 	{
- 		time_t t_lower, t_upper;
- 		value_t v_lower, v_upper;
--		get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
-+		this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
- 		return lerp(t_lower, t_upper, v_lower, v_upper, Time);
- 	}
- protected:
-@@ -116,7 +116,7 @@
- 	{
- 		time_t t_lower, t_upper;
- 		value_t v_lower, v_upper;
--		get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
-+		this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
- 		return lerp(t_lower, t_upper, v_lower, v_upper, Time);
- 	} 
- protected:
diff --git a/graphics/k3d/k3d_gtkmm224.patch b/graphics/k3d/k3d_gtkmm224.patch
deleted file mode 100644
index e62ef08a6dee2..0000000000000
--- a/graphics/k3d/k3d_gtkmm224.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp	2010-07-02 23:27:46.000000000 -0300
-+++ k3d-source-0.8.0.2_patched/k3dsdk/ngui/main_document_window.cpp	2011-05-01 22:24:14.000000000 -0300
-@@ -1371,7 +1371,7 @@
- 			Gtk::HBox import_box(false, 5);
- 			Gtk::Label import_label(_("Choose import plugin:"));
- 
--			Gtk::ComboBox import_combo(model);
-+			Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &) model);
- 			import_combo.pack_start(columns.icon, false);
- 			import_combo.pack_start(columns.label);
- 			import_combo.set_active(0);
-@@ -1461,7 +1461,7 @@
- 			Gtk::HBox export_box(false, 5);
- 			Gtk::Label export_label(_("Choose export plugin:"));
- 
--			Gtk::ComboBox export_combo(model);
-+			Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &) model);
- 			export_combo.pack_start(columns.icon, false);
- 			export_combo.pack_start(columns.label);
- 			export_combo.set_active(0);
---- k3d-source-0.8.0.2/k3dsdk/ngui/render.cpp	2010-07-02 23:27:46.000000000 -0300
-+++ k3d-source-0.8.0.2_patched/k3dsdk/ngui/render.cpp	2011-05-01 22:41:08.000000000 -0300
-@@ -169,7 +169,7 @@
- 		row[columns.separator] = false;
- 	}
- 
--	Gtk::ComboBox combo(model);
-+	Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
- 
- 	combo.pack_start(columns.icon, false);
- 
-@@ -295,7 +295,7 @@
- 		row[columns.separator] = false;
- 	}
- 
--	Gtk::ComboBox combo(model);
-+	Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
- 
- 	combo.pack_start(columns.icon, false);
- 
diff --git a/graphics/k3d/png14.patch b/graphics/k3d/png14.patch
deleted file mode 100644
index 8f0895ac2e724..0000000000000
--- a/graphics/k3d/png14.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-07-02 23:27:47.000000000 -0300
-+++ k3d-source-0.8.0.2_patched/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-07-13 08:04:55.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);

-+                     NULL, 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);

-+                     NULL, 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))) {