commit: 9ac346b7c9110d5ecc7d6601064e2aaafa1c7e61 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Jan 19 09:22:16 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Wed Feb 27 05:35:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac346b7
dev-db/mysql-workbench: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10868 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/mysql-workbench-6.2.3-CMakeLists.patch | 43 ---------------------- .../mysql-workbench-6.3.3-mysql_options4.patch | 40 -------------------- .../files/mysql-workbench-6.3.4-cxx11.patch | 39 -------------------- .../files/mysql-workbench-6.3.4-gtk.patch | 38 ------------------- 4 files changed, 160 deletions(-) diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch deleted file mode 100644 index 6e9a4d5e141..00000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200 -+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200 -@@ -18,6 +18,9 @@ - find_package(PkgConfig REQUIRED) - - find_package(GTK2 2.20 REQUIRED gtk gtkmm) -+if (NOT GTK2_FOUND) -+ message( FATAL_ERROR "Not all GTK2 components were found!" ) -+endif() - pkg_check_modules(GTHREAD REQUIRED gthread-2.0) - pkg_check_modules(GMODULE REQUIRED gmodule-2.0) - set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS}) -@@ -32,7 +35,8 @@ - endif () - - # All known publicly available versions of Antlr3C are buggy -- -+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973 -+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too - if (SKIP_BUNDLED_ANTLR) - find_package(Antlr3C) - endif () -@@ -89,7 +93,8 @@ - pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12) - pkg_check_modules(UUID REQUIRED uuid) - pkg_check_modules(LIBZIP REQUIRED libzip) --if (UNIX) -+ -+if (UNIX AND USE_GNOME_KEYRING) - pkg_check_modules(GNOME_KEYRING gnome-keyring-1) - if (GNOME_KEYRING_FOUND) - set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING") -@@ -99,7 +104,10 @@ - set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING") - endif() - endif() -+ if (NOT GNOME_KEYRING_FOUND) -+ message( FATAL_ERROR "Gnome keyring libraries could not be found" ) -+ endif() - endif() - - include (CheckFunctionExists) - diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch deleted file mode 100644 index 7fb9c8d57fc..00000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-15 15:54:19.000000000 +0200 -+++ plugins/migration/copytable/copytable.cpp 2015-04-26 08:53:08.871167725 +0200 -@@ -1920,12 +1920,17 @@ - _incoming_data_charset = "latin1"; - - mysql_init(&_mysql); -+/* This is optional has compiled in for MySQL >= 5.6.6 -+ * Looks like MariaDB does not support this as supposed, -+ * so disable completly. */ -+#ifndef MARIADB_BASE_VERSION - #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) - #if MYSQL_CHECK_VERSION(5,6,6) - if (is_mysql_version_at_least(5,6,6)) - mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); - #endif - #endif -+#endif - - // _bulk_insert_record is used to prepare a single record string, the connection - // is needed to escape binary data properly ---- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-26 08:57:30.444285953 +0200 -+++ plugins/migration/copytable/copytable.cpp 2015-04-26 10:16:39.234711324 +0200 -@@ -2875,6 +2875,9 @@ - - // This function is used to create a legal SQL string that you can use in an SQL statement - // This is needed because the escaping depends on the character set in use by the server -+ #ifdef MARIADB_BASE_VERSION -+ length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); -+ #else - #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) - #if MYSQL_CHECK_VERSION(5,7,6) - if (is_mysql_version_at_least(5,7,6)) -@@ -2885,6 +2888,7 @@ - length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); - #endif - #endif -+ #endif - - return true; - } diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch deleted file mode 100644 index e8ed54a8c70..00000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch +++ /dev/null @@ -1,39 +0,0 @@ -Last-Update: 2015-10-24 -Forwarded: not-needed -Bug-Upstream: https://bugs.mysql.com/bug.php?id=78668 -From: Marcin Szalowicz -Author: Dmitry Smirnov <[email protected]> -Description: fix FTBFS - ~~~~ - library/forms/view.cpp:515:32: error: cannot convert 'boost::signals2::signal<bool()>::result_type {aka boost::optional<bool>}' to 'bool' in return - return _signal_mouse_leave(); - ^ - library/forms/CMakeFiles/mforms.dir/build.make:1865: recipe for target 'library/forms/CMakeFiles/mforms.dir/view.cpp.o' failed - ~~~~ - ---- a/library/forms/swig/mforms.i -+++ b/library/forms/swig/mforms.i -@@ -532,9 +532,9 @@ - void add_##method(PyObject *callback) { signal->connect(pycall_void_toolbaritem_fun(callback)); } - - #define SWIG_ADD_SIGNAL_BOOL_INT_CALLBACK(method, signal)\ - void add_##method(PyObject *callback) { signal->connect(pycall_bool_int_fun(callback)); }\ -- bool call_##method(int i) { return (*signal)(i); } -+ bool call_##method(int i) { return *( (*signal)(i) ); } - - #define SWIG_ADD_SIGNAL_VOID_ENTRYACTION_CALLBACK(method, signal)\ - void add_##method(PyObject *callback) { signal->connect(pycall_void_entryaction_fun(callback)); } - ---- a/library/forms/view.cpp -+++ b/library/forms/view.cpp -@@ -511,9 +511,9 @@ - - bool View::mouse_leave() - { - if (_signal_mouse_leave.num_slots() > 0) -- return _signal_mouse_leave(); -+ return *_signal_mouse_leave(); - return false; - } - - //-------------------------------------------------------------------------------------------------- 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 deleted file mode 100644 index e975906e19a..00000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch +++ /dev/null @@ -1,38 +0,0 @@ -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();
