Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2016-11-14 20:14:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-08-13 18:30:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2016-11-14 20:14:57.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Nov 12 11:13:22 UTC 2016 - [email protected] + +- Fix building with latest gcc6 + * mysql-workbench-gcc6.patch + +------------------------------------------------------------------- +Sun Oct 9 08:09:17 UTC 2016 - [email protected] + +- Use ninja and gold linker to speedup building + +------------------------------------------------------------------- New: ---- mysql-workbench-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.t65nLR/_old 2016-11-14 20:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.t65nLR/_new 2016-11-14 20:14:59.000000000 +0100 @@ -44,22 +44,28 @@ # disabled , system scintila is buil with gtk3 Patch7: mysql-workbench-unbundle-libscintilla.patch Patch8: mysql-workbench-preload-sqlparser.patch +# PATCH-FIX-UPSTREAM https://bugs.mysql.com/bug.php?id=83372 +Patch9: mysql-workbench-gcc6.patch BuildRequires: Mesa-devel BuildRequires: ant +BuildRequires: binutils-gold BuildRequires: boost-devel BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-keyring-devel -BuildRequires: gtkmm24-devel +BuildRequires: gtkmm2-devel BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel BuildRequires: libmysqld-devel > 5.1 +BuildRequires: ninja # use bundled scintilla lib #BuildRequires: libscintilla-devel +BuildRequires: libsigc++2-devel BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: python-devel BuildRequires: python-paramiko BuildRequires: swig BuildRequires: tinyxml-devel @@ -124,18 +130,20 @@ %patch6 -p1 #%%patch7 -p1 %patch8 -p1 +%patch9 -p1 %build +%define __builder ninja export CXXFLAGS="%{optflags} -std=c++11" %cmake \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold -pie" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold -pie" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold -pie" \ -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \ -DCMAKE_BUILD_TYPE=%{edition} \ -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \ -DUSE_UNIXODBC=TRUE -make %{?_smp_mflags} +%make_jobs %install %cmake_install ++++++ mysql-workbench-gcc6.patch ++++++ >From 743c9cfb9d95f4dfcf2d4e1dc412fd5495100aac Mon Sep 17 00:00:00 2001 From: Christian Hesse <[email protected]> Date: Thu, 13 Oct 2016 10:56:55 +0200 Subject: [PATCH] fix compilation with gcc 6.2.1 Compilation fails with recent versions of gcc with: error: cannot convert 'Glib::RefPtr<Gdk::Colormap>' to 'bool' in assignment and error: no match for 'operator!=' (operand types are 'Glib::RefPtr<Gdk::Window>' and 'int') This fixes compilation with gcc 6.2.1. --- library/forms/gtk/src/lf_popover.cpp | 4 ++-- library/forms/gtk/src/lf_popup.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/library/forms/gtk/src/lf_popover.cpp b/library/forms/gtk/src/lf_popover.cpp index 1a659a6..7502811 100644 --- a/library/forms/gtk/src/lf_popover.cpp +++ b/library/forms/gtk/src/lf_popover.cpp @@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const int rx, const int ry, const mforms::Start 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 @@ void PopoverWidget::show_popover(const int rx, const int ry, const mforms::Start { Gdk::ModifierType mask; Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default(); - if (dsp != 0) + if (dsp) dsp->get_pointer(x, y, mask); } diff --git a/library/forms/gtk/src/lf_popup.cpp b/library/forms/gtk/src/lf_popup.cpp index 289c511..5de3b49 100644 --- a/library/forms/gtk/src/lf_popup.cpp +++ b/library/forms/gtk/src/lf_popup.cpp @@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const Glib::RefPtr<Gdk::Screen>& screen) { d("\n"); Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap(); - _have_rgba = colormap; + if (colormap) + _have_rgba = true; if (!_have_rgba) colormap = screen->get_rgb_colormap();
