From 135baf55607376561965c0830b7ad465bc5573fd Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Mon, 27 Apr 2015 11:11:30 +0700 Subject: development/mysql-workbench: Removed obsolete patches. Signed-off-by: Willy Sudiarto Raharjo --- .../mysql-workbench-ctemplate.patch | 29 ------------------- .../mysql-workbench/mysql-workbench-paramiko.patch | 22 --------------- .../mysql-workbench-py-append.patch | 33 ---------------------- 3 files changed, 84 deletions(-) delete mode 100644 development/mysql-workbench/mysql-workbench-ctemplate.patch delete mode 100644 development/mysql-workbench/mysql-workbench-paramiko.patch delete mode 100644 development/mysql-workbench/mysql-workbench-py-append.patch (limited to 'development/mysql-workbench') diff --git a/development/mysql-workbench/mysql-workbench-ctemplate.patch b/development/mysql-workbench/mysql-workbench-ctemplate.patch deleted file mode 100644 index ac51ddff6a..0000000000 --- a/development/mysql-workbench/mysql-workbench-ctemplate.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/backend/wbpublic/sqlide/recordset_text_storage.cpp 2014-03-26 16:47:23.000000000 +0100 -+++ b/backend/wbpublic/sqlide/recordset_text_storage.cpp 2014-05-09 01:31:36.099430631 +0200 -@@ -205,7 +205,7 @@ - if (!pre_tpl) - g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str()); - else -- pre_tpl->ReloadIfChanged(); -+ ctemplate::Template::ReloadAllIfChanged(); - } - if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS)) - { -@@ -214,7 +214,7 @@ - if (!post_tpl) - g_warning("Failed to open template file: `%s`", post_tpl_path.c_str()); - else -- post_tpl->ReloadIfChanged(); -+ ctemplate::Template::ReloadAllIfChanged(); - } - } - -@@ -223,7 +223,7 @@ - throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str())); - } - -- tpl->ReloadIfChanged(); -+ ctemplate::Template::ReloadAllIfChanged(); - - std::auto_ptr dict(new TemplateDictionary("/")); - BOOST_FOREACH (const Parameters::value_type ¶m, _parameters) \ No newline at end of file diff --git a/development/mysql-workbench/mysql-workbench-paramiko.patch b/development/mysql-workbench/mysql-workbench-paramiko.patch deleted file mode 100644 index 4c8196dd79..0000000000 --- a/development/mysql-workbench/mysql-workbench-paramiko.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/plugins/wb.admin/backend/wb_admin_ssh.py b/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 -@@ -88,6 +88,9 @@ if paramiko and server_version_str2tuple - if (server_version_str2tuple(paramiko.__version__) <= (1, 14, 99)): - 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]) -@@ -103,6 +106,8 @@ if paramiko and server_version_str2tuple - chan._set_transport(self) - if (server_version_str2tuple(paramiko.__version__) <= (1, 14, 99)): - 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) diff --git a/development/mysql-workbench/mysql-workbench-py-append.patch b/development/mysql-workbench/mysql-workbench-py-append.patch deleted file mode 100644 index 9fb289d091..0000000000 --- a/development/mysql-workbench/mysql-workbench-py-append.patch +++ /dev/null @@ -1,33 +0,0 @@ -From be3bb1110f1fd8af7ecf50e9524ce037200abf51 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Mon, 29 Dec 2014 19:54:01 +0100 -Subject: [PATCH 1/1] fix syntax error in wb_admin_export.py - -Correct syntax is args.append(...). - -Signed-off-by: Christian Hesse ---- - plugins/wb.admin/frontend/wb_admin_export.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/wb.admin/frontend/wb_admin_export.py b/plugins/wb.admin/frontend/wb_admin_export.py -index 40f5167..4267201 100644 ---- a/plugins/wb.admin/frontend/wb_admin_export.py -+++ b/plugins/wb.admin/frontend/wb_admin_export.py -@@ -1709,10 +1709,10 @@ class WbAdminExportTab(WbAdminSchemaListTab): - # description, object_count, pipe_factory, extra_args, objects - args = [] - if not dump_triggers: -- args.append['--skip-triggers'] -- -+ args.append('--skip-triggers') -+ - if skip_table_structure: -- args.append['--no-create-info'] -+ args.append('--no-create-info') - - if skip_data: - task = self.TableDumpNoData(schema,table, args, lambda schema=schema,table=table:self.dump_to_folder(schema, table)) --- -2.2.1 - -- cgit v1.2.3