summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-07-19 19:29:57 +0200
committerPatrice Clement <monsieurp@gentoo.org>2016-07-30 08:46:41 +0200
commit3e85c8c4859384b2e7860512dee265c8d18ec370 (patch)
tree7651bef4ad238b7146bfcac02f06ae99e39c6046 /dev-db/mysql-workbench
parentx11-terms/xfce4-terminal: Bump to 0.6.90, early GTK+3 release (diff)
downloadgentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.gz
gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.bz2
gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.zip
dev-db/*: remove unused patches.
Squash all commit messages into a single one. Closes: https://github.com/gentoo/gentoo/pull/1936 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-db/mysql-workbench')
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch29
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch10
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch35
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch42
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch51
5 files changed, 0 insertions, 167 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch
deleted file mode 100644
index e0dbc2bef5e0..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch taken from opensuse:
-https://www.mail-archive.com/opensuse-commit@opensuse.org/msg60296.html
-
-Modified to be conditional on MARIADB_BASE_VERSION
-
-++++++ mysql-workbench-mysql_options4.patch ++++++
-diff --git a/plugins/migration/copytable/copytable.cpp
-b/plugins/migration/copytable/copytable.cpp
-index b273287..77c227b 100644
---- a/plugins/migration/copytable/copytable.cpp
-+++ b/plugins/migration/copytable/copytable.cpp
-@@ -1633,12 +1633,17 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const
- std::string &hostname, int port,
- _truncate = false;
-
- 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)
- 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
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch
deleted file mode 100644
index 7f4013a2ecf3..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/migration/CMakeLists.txt.~1~ 2014-07-12 08:45:56.808929549 +0200
-+++ plugins/migration/CMakeLists.txt 2014-07-12 08:49:26.659049880 +0200
-@@ -7,6 +7,7 @@
-
- add_definitions(${ODBC_DEFINITIONS})
-
-+SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
- add_executable(wbcopytables
- copytable/copytable.cpp
- copytable/python_copy_data_source.cpp
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch
deleted file mode 100644
index fbcd5bc05999..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix compilation with ctemplate 2.3 by avoiding long-deprecated method.
-
-Patch by Marcel Pennewiß in https://bugs.gentoo.org/show_bug.cgi?id=533086
-
-Unresolved upstream bug http://bugs.mysql.com/bug.php?id=72585
-
---- mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
-+++ mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
-@@ -204,7 +204,7 @@
- if (!pre_tpl)
- g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str());
- else
-- pre_tpl->ReloadIfChanged();
-+ pre_tpl->ReloadAllIfChanged();
- }
- if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS))
- {
-@@ -213,7 +213,7 @@
- if (!post_tpl)
- g_warning("Failed to open template file: `%s`", post_tpl_path.c_str());
- else
-- post_tpl->ReloadIfChanged();
-+ post_tpl->ReloadAllIfChanged();
- }
- }
-
-@@ -222,7 +222,7 @@
- throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str()));
- }
-
-- tpl->ReloadIfChanged();
-+ tpl->ReloadAllIfChanged();
-
- std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
- BOOST_FOREACH (const Parameters::value_type &param, _parameters)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
deleted file mode 100644
index 96da8534944b..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch to make the query results window work with glib 2.42.
-https://bugs.gentoo.org/show_bug.cgi?id=536024
-http://bugs.mysql.com/bug.php?id=74147
-
-
-=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
---- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17 16:42:25 +0000
-+++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16 10:33:12 +0000
-@@ -528,7 +528,6 @@
- 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)
-
-=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
---- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03 +0000
-+++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12 +0000
-@@ -232,9 +232,16 @@
-
- //==============================================================================
-
--class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
-- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
-- public base::trackable
-+#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:
-
-
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch
deleted file mode 100644
index ad131b781ace..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Last-Update: 2014-10-07
-Forwarded: not-needed
-From: Alfredo Kojima
-Bug-Upstream: http://bugs.mysql.com/bug.php?id=74223
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763971
-Description: fix connectivity through SSH tunnel.
-
-=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
---- a/plugins/wb.admin/backend/wb_admin_ssh.py
-+++ b/plugins/wb.admin/backend/wb_admin_ssh.py
-@@ -84,10 +84,14 @@
- m = Message()
- m.add_byte(chr(MSG_CHANNEL_OPEN))
- m.add_string(kind)
- m.add_int(chanid)
-- m.add_int(self.window_size)
-- m.add_int(self.max_packet_size)
-+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
-+ m.add_int(self.window_size)
-+ m.add_int(self.max_packet_size)
-+ else:
-+ m.add_int(self.default_window_size)
-+ m.add_int(self.default_max_packet_size)
- if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
- m.add_string(dest_addr[0])
- m.add_int(dest_addr[1])
- m.add_string(src_addr[0])
-@@ -99,9 +103,12 @@
- self._channels.put(chanid, chan)
- self.channel_events[chanid] = event = threading.Event()
- self.channels_seen[chanid] = True
- chan._set_transport(self)
-- chan._set_window(self.window_size, self.max_packet_size)
-+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
-+ chan._set_window(self.window_size, self.max_packet_size)
-+ else:
-+ chan._set_window(self.default_window_size, self.default_max_packet_size)
- finally:
- self.lock.release()
- self._send_user_message(m)
- ts = time.time() + OPEN_CHANNEL_TIMEOUT if (timeout is None) else timeout
-@@ -669,8 +676,9 @@
-
- read_timeout = 10
-
- if self.client is not None:
-+ chan = None
- transport = self.client.get_transport()
- try:
- spawn_process = False
- if 'nohup' in cmd: