Hello community,

here is the log from the commit of package mysql-workbench for openSUSE:Factory 
checked in at 2015-06-09 08:49:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
 and      /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mysql-workbench"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes  
2015-03-30 19:33:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes     
2015-06-09 08:50:30.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun  5 14:55:21 UTC 2015 - wba...@tmo.at
+
+- added mysql-workbench-glib.patch: fix empty grid result
+  (http://bugs.mysql.com/74147, boo#904767)
+
+-------------------------------------------------------------------

New:
----
  mysql-workbench-glib.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.IeruYz/_old  2015-06-09 08:50:31.000000000 +0200
+++ /var/tmp/diff_new_pack.IeruYz/_new  2015-06-09 08:50:31.000000000 +0200
@@ -47,6 +47,8 @@
 Patch3:         mysql-workbench-mysql_options4.patch
 # PATCH-FIX-UPSTREAM sfal...@opensuse.org
 Patch4:         mysql-workbench-cmake-3.2.patch
+# PATCH-FIX-UPSTREAM mysql-workbench-glib.patch http://bugs.mysql.com/74147, 
boo#904767 wba...@tmo.at -- fix empty grid result
+Patch5:         mysql-workbench-glib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # Keep them alphabetic order
@@ -144,6 +146,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # FIX this is too much on obs Out of Memory use

++++++ mysql-workbench-glib.patch ++++++
diff -rup a/frontend/linux/linux_utilities/listmodel_wrapper.cpp 
b/frontend/linux/linux_utilities/listmodel_wrapper.cpp
--- a/frontend/linux/linux_utilities/listmodel_wrapper.cpp      2014-06-20 
21:18:09.000000000 +0200
+++ b/frontend/linux/linux_utilities/listmodel_wrapper.cpp      2014-11-10 
23:37:43.645824317 +0100
@@ -528,7 +528,6 @@ void ColumnsModel::add_model_column(Gtk:
 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)
diff -rup a/frontend/linux/linux_utilities/listmodel_wrapper.h 
b/frontend/linux/linux_utilities/listmodel_wrapper.h
--- a/frontend/linux/linux_utilities/listmodel_wrapper.h        2014-06-20 
21:18:09.000000000 +0200
+++ b/frontend/linux/linux_utilities/listmodel_wrapper.h        2014-11-10 
23:37:43.645824317 +0100
@@ -232,9 +232,16 @@ inline bool can_convert(const Glib::ustr
 
 
//==============================================================================
 
-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel, 
+#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:



Reply via email to