commit: 9e95f740110153a2a1d2d0440484fa717bf0f0c8 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sun May 21 08:17:54 2017 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sun May 21 08:18:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e95f740
dev-db/mysql-workbench: fix compilation with recent glibmm, fixing bug 600376 Package-Manager: Portage-2.3.5, Repoman-2.3.1 .../files/mysql-workbench-6.3.4-gtk.patch | 38 ++++++++++++++++++++++ .../mysql-workbench-6.3.4-r2.ebuild | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch new file mode 100644 index 00000000000..e975906e19a --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch @@ -0,0 +1,38 @@ +Last-Update: 2016-11-13 +Forwarded: not-needed +Author: Dmitry Smirnov <[email protected]> +Bug-Debian: https://bugs.debian.org/839356 +Description: fix FTBFS + +--- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popover.cpp ++++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popover.cpp +@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const i + 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 i + { + Gdk::ModifierType mask; + Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default(); +- if (dsp != 0) ++ if (dsp) + dsp->get_pointer(x, y, mask); + } + +--- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popup.cpp ++++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popup.cpp +@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const + { + 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(); diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild index eff874ba537..4d946466015 100644 --- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild @@ -74,7 +74,8 @@ src_prepare() { epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \ "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \ "${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \ - "${FILESDIR}/${PN}-6.3.4-cxx11.patch" + "${FILESDIR}/${PN}-6.3.4-cxx11.patch" \ + "${FILESDIR}/${PN}-6.3.4-gtk.patch" sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \ modules/db.mysql.sqlparser/CMakeLists.txt
