[packages/mysql-workbench] - rel 2; patch for bug http://bugs.mysql.com/74147

[arekm]

commit c73d669d9858977aa2d43c9fccecf40885bf87bc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Oct 16 14:14:36 2014 +0200

    - rel 2; patch for bug  http://bugs.mysql.com/74147

 mysql-workbench-bug-74147.patch | 37 +++++++++++++++++++++++++++++++++++++
 mysql-workbench.spec            |  4 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 7ed08d7..9acb5a4 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -14,12 +14,13 @@ Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
 Version:	6.2.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-community-%{version}-src.tar.gz
 # Source0-md5:	d58ac1beeb3bdaaba65b48e2a24df79b
 Source1:	PLD_Linux_(MySQL_Package).xml
+Patch1:		mysql-workbench-bug-74147.patch
 Patch5:		pld-profile.patch
 Patch7:		log_slow_queries.patch
 Patch8:		bashism.patch
@@ -92,6 +93,7 @@ skomplikowanych migracji do MySQL-a.
 
 %prep
 %setup -q -n %{name}-community-%{version}-src
+%patch1 -p0
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
diff --git a/mysql-workbench-bug-74147.patch b/mysql-workbench-bug-74147.patch
new file mode 100644
index 0000000..d150d93
--- /dev/null
+++ b/mysql-workbench-bug-74147.patch
@@ -0,0 +1,37 @@
+=== 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:
+
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/c73d669d9858977aa2d43c9fccecf40885bf87bc