From 27be4116400a9b0cf09767bd79ae03c491b8abbd Mon Sep 17 00:00:00 2001
From: Ralf Corsépius <corsepiu@fedoraproject.org>
Date: May 10 2011 17:10:33 +0000
Subject: Add k3d-0.8.0.2-gtkmm2.24.diff (Address FTBS caused by gtkmm24 incompatiblity).


---

diff --git a/k3d-0.8.0.2-gtkmm2.24.diff b/k3d-0.8.0.2-gtkmm2.24.diff
new file mode 100644
index 0000000..5c39f1b
--- /dev/null
+++ b/k3d-0.8.0.2-gtkmm2.24.diff
@@ -0,0 +1,42 @@
+diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/ngui/main_document_window.cpp k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp
+--- k3d-source-0.8.0.2.orig/k3dsdk/ngui/main_document_window.cpp	2010-07-03 04:27:46.000000000 +0200
++++ k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp	2011-05-10 17:37:45.749942401 +0200
+@@ -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);
+diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/ngui/render.cpp k3d-source-0.8.0.2/k3dsdk/ngui/render.cpp
+--- k3d-source-0.8.0.2.orig/k3dsdk/ngui/render.cpp	2010-07-03 04:27:46.000000000 +0200
++++ k3d-source-0.8.0.2/k3dsdk/ngui/render.cpp	2011-05-10 17:37:45.750942414 +0200
+@@ -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/k3d.spec b/k3d.spec
index be778be..e8f387b 100644
--- a/k3d.spec
+++ b/k3d.spec
@@ -1,6 +1,6 @@
 Name:           k3d
 Version:        0.8.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -10,6 +10,8 @@ Source0:        http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.b
 Source1:        k3d.desktop
 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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -88,6 +90,7 @@ rendering a model written by K-3D.
 %setup -q -n k3d-source-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # binaries in source tarball
 rm tests/*.pyc
@@ -182,6 +185,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Tue May 10 2011 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.8.0.2-3
+- Add k3d-0.8.0.2-gtkmm2.24.diff (Address FTBS caused by gtkmm24 incompatiblity).
+
 * Thu Feb 10 2011 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.8.0.2-2
 - Remove obsolete Obsoletes: k3d-examples.