[k3d] Add k3d-0.8.0.2-gcc-4.7.patch (Address gcc-4.7 FTBS).

[corsepiu]

commit 5c26d5ddd6658b2897d840ed88b0fef76924e93c
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Jan 5 07:02:53 2012 +0100

    Add k3d-0.8.0.2-gcc-4.7.patch (Address gcc-4.7 FTBS).

 k3d-0.8.0.2-gcc-4.7.patch |   60 +++++++++++++++++++++++++++++++++++++++++++++
 k3d.spec                  |    7 ++++-
 2 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/k3d-0.8.0.2-gcc-4.7.patch b/k3d-0.8.0.2-gcc-4.7.patch
new file mode 100644
index 0000000..9605187
--- /dev/null
+++ b/k3d-0.8.0.2-gcc-4.7.patch
@@ -0,0 +1,60 @@
+diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/data.h k3d-source-0.8.0.2/k3dsdk/data.h
+--- k3d-source-0.8.0.2.orig/k3dsdk/data.h	2010-07-03 04:27:46.000000000 +0200
++++ k3d-source-0.8.0.2/k3dsdk/data.h	2012-01-05 06:34:18.127223587 +0100
+@@ -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);
+ 	}
+ };
+ 
+diff -Naur k3d-source-0.8.0.2.orig/modules/animation/interpolator.h k3d-source-0.8.0.2/modules/animation/interpolator.h
+--- k3d-source-0.8.0.2.orig/modules/animation/interpolator.h	2010-07-03 04:27:55.000000000 +0200
++++ k3d-source-0.8.0.2/modules/animation/interpolator.h	2012-01-05 06:05:38.400985430 +0100
+@@ -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/k3d.spec b/k3d.spec
index e15c09f..c690dab 100644
--- a/k3d.spec
+++ b/k3d.spec
@@ -1,6 +1,6 @@
 Name:           k3d
 Version:        0.8.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@ 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
+Patch4:         k3d-0.8.0.2-gcc-4.7.patch
 
 # This list is alpha sorted.
 BuildRequires:  boost-devel
@@ -91,6 +92,7 @@ rendering a model written by K-3D.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # binaries in source tarball
 rm tests/*.pyc
@@ -180,6 +182,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Thu Jan 05 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.8.0.2-6
+- Add k3d-0.8.0.2-gcc-4.7.patch (Address gcc-4.7 FTBS).
+
 * 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.