[packages/mysql-workbench/v6.3.5] - fix building with gcc6 - rel 3

[baggins]

commit 21fc66abf93a579f3fa6442827a6d16820de9ca8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 4 00:24:17 2017 +0100

    - fix building with gcc6
    - rel 3

 gcc6.patch           | 36 ++++++++++++++++++++++++++++++++++++
 mysql-workbench.spec |  4 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 6dc3012..06716e3 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -14,7 +14,7 @@ Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
 Version:	6.3.5
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/workbench/
@@ -30,6 +30,7 @@ Patch3:		wrapper-exec.patch
 Patch4:		antlr-res.patch
 Patch5:		mysql-workbench-bug-78668.patch
 Patch6:		mysql-workbench-json.patch
+Patch7:		gcc6.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -107,6 +108,7 @@ skomplikowanych migracji do MySQL-a.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 cp -p '%{SOURCE2}' res/mysql.profiles
 
 %if %{with system_antlr}
diff --git a/gcc6.patch b/gcc6.patch
new file mode 100644
index 0000000..10bf810
--- /dev/null
+++ b/gcc6.patch
@@ -0,0 +1,36 @@
+diff -ur mysql-workbench-community-6.3.5-src/library/forms/gtk/src/lf_popover.cpp mysql-workbench-community-6.3.5-src-gcc6/library/forms/gtk/src/lf_popover.cpp
+--- mysql-workbench-community-6.3.5-src/library/forms/gtk/src/lf_popover.cpp	2015-10-17 16:35:48.000000000 +0200
++++ mysql-workbench-community-6.3.5-src-gcc6/library/forms/gtk/src/lf_popover.cpp	2017-03-03 22:55:15.329538287 +0100
+@@ -380,7 +380,7 @@
+   if (_style == mforms::PopoverStyleTooltip)
+   {
+     Glib::RefPtr<Gdk::Window> wnd = this->get_window();
+-    if (wnd != 0)
++    if (wnd)
+     {
+       int xx;
+       int yy;
+@@ -396,7 +396,7 @@
+   {
+     Gdk::ModifierType mask;
+     Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default();
+-    if (dsp != 0)
++    if (dsp)
+       dsp->get_pointer(x, y, mask);
+   }
+ 
+diff -ur mysql-workbench-community-6.3.5-src/library/forms/gtk/src/lf_popup.cpp mysql-workbench-community-6.3.5-src-gcc6/library/forms/gtk/src/lf_popup.cpp
+--- mysql-workbench-community-6.3.5-src/library/forms/gtk/src/lf_popup.cpp	2015-10-17 16:35:48.000000000 +0200
++++ mysql-workbench-community-6.3.5-src-gcc6/library/forms/gtk/src/lf_popup.cpp	2017-03-03 22:57:39.582616400 +0100
+@@ -81,7 +81,10 @@
+ {
+   d("\n");
+   Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap();
+-  _have_rgba = colormap;
++  if (colormap)
++    _have_rgba = true;
++  else
++    _have_rgba = false;
+ 
+   if (!_have_rgba)
+     colormap = screen->get_rgb_colormap();
================================================================

---- gitweb:

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