summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch')
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
new file mode 100644
index 000000000000..96da8534944b
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
@@ -0,0 +1,42 @@
+Patch to make the query results window work with glib 2.42.
+https://bugs.gentoo.org/show_bug.cgi?id=536024
+http://bugs.mysql.com/bug.php?id=74147
+
+
+=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
+--- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17 16:42:25 +0000
++++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16 10:33:12 +0000
+@@ -528,7 +528,6 @@
+ ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView *treeview, const std::string& name)
+ : Glib::ObjectBase(typeid(ListModelWrapper))
+ , Glib::Object()
+- , Gtk::TreeModel()
+ , _treeview(treeview)
+ , _iconview(0)
+ , _context_menu(0)
+
+=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
+--- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03 +0000
++++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12 +0000
+@@ -232,9 +232,16 @@
+
+ //==============================================================================
+
+-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
+- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+- public base::trackable
++#if GLIB_CHECK_VERSION(2, 42, 0)
++class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
++ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
++ public base::trackable
++#else
++class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
++ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
++ public base::trackable
++
++#endif
+ {
+ friend class ColumnsModel;
+ protected:
+
+