aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2011-07-30 09:39:44 +0000
committerKoop Mast <kwm@FreeBSD.org>2011-07-30 09:39:44 +0000
commitca18c5b1d871a92954334d7e56906b51e1c2d086 (patch)
tree69ab1e6d1c3aa62d8921d89f1d46c51f48b49f3a /graphics
parent769329177b45b3221adba2ec0ddb4d734343d53e (diff)
downloadports-ca18c5b1d871a92954334d7e56906b51e1c2d086.tar.gz
ports-ca18c5b1d871a92954334d7e56906b51e1c2d086.zip
Build fixes with glib 2.28. gtk 2.24, gtkmm 2.24 and vala 0.12.
Notes
Notes: svn path=/head/; revision=278564
Diffstat (limited to 'graphics')
-rw-r--r--graphics/k3d/Makefile2
-rw-r--r--graphics/k3d/files/patch-ngui__main_document_window.cpp20
-rw-r--r--graphics/k3d/files/patch-ngui_render.cpp20
3 files changed, 41 insertions, 1 deletions
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 2ad254022aa9..ee3e02d9c543 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -9,7 +9,7 @@
PORTNAME= k3d
PORTVERSION= 0.6.7.0
DISTVERSIONSUFFIX=-src
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/K-3D%20Source/K-3D%20${PORTVERSION}
diff --git a/graphics/k3d/files/patch-ngui__main_document_window.cpp b/graphics/k3d/files/patch-ngui__main_document_window.cpp
new file mode 100644
index 000000000000..d51a8e792bff
--- /dev/null
+++ b/graphics/k3d/files/patch-ngui__main_document_window.cpp
@@ -0,0 +1,20 @@
+--- ngui/main_document_window.cpp.orig 2007-01-23 05:06:31.000000000 +0100
++++ ngui/main_document_window.cpp 2011-07-26 20:57:07.000000000 +0200
+@@ -1501,7 +1501,7 @@ private:
+ 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);
+@@ -1582,7 +1582,7 @@ private:
+ 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 --git a/graphics/k3d/files/patch-ngui_render.cpp b/graphics/k3d/files/patch-ngui_render.cpp
new file mode 100644
index 000000000000..0089646734b7
--- /dev/null
+++ b/graphics/k3d/files/patch-ngui_render.cpp
@@ -0,0 +1,20 @@
+--- ngui/render.cpp.orig 2007-01-24 06:12:37.000000000 +0100
++++ ngui/render.cpp 2011-07-26 21:00:55.000000000 +0200
+@@ -162,7 +162,7 @@
+ row[columns.separator] = false;
+ }
+
+- Gtk::ComboBox combo(model);
++ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
+
+ combo.pack_start(columns.icon, false);
+
+@@ -286,7 +286,7 @@
+ row[columns.separator] = false;
+ }
+
+- Gtk::ComboBox combo(model);
++ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model);
+
+ combo.pack_start(columns.icon, false);
+