Date: Tuesday, March 3, 2015 @ 14:27:08
Author: eworm
Revision: 128621
upgpkg: mysql-workbench 6.2.5-1
* new upstream release
* removed patches that have been included upstream
Modified:
mysql-workbench/trunk/PKGBUILD
Deleted:
mysql-workbench/trunk/0002-mysql-workbench-ctemplate.patch
mysql-workbench/trunk/0003-mysql-workbench-keyring.patch
mysql-workbench/trunk/0004-mysql-workbench-paramiko.patch
mysql-workbench/trunk/0005-mysql-workbench-py-append.patch
--------------------------------------+
0002-mysql-workbench-ctemplate.patch | 31 -------------------------------
0003-mysql-workbench-keyring.patch | 17 -----------------
0004-mysql-workbench-paramiko.patch | 23 -----------------------
0005-mysql-workbench-py-append.patch | 18 ------------------
PKGBUILD | 28 +++-------------------------
5 files changed, 3 insertions(+), 114 deletions(-)
Deleted: 0002-mysql-workbench-ctemplate.patch
===================================================================
--- 0002-mysql-workbench-ctemplate.patch 2015-03-03 13:02:47 UTC (rev
128620)
+++ 0002-mysql-workbench-ctemplate.patch 2015-03-03 13:27:08 UTC (rev
128621)
@@ -1,31 +0,0 @@
-diff --git a/backend/wbpublic/sqlide/recordset_text_storage.cpp
b/backend/wbpublic/sqlide/recordset_text_storage.cpp
-index d027308..1063498 100644
---- a/backend/wbpublic/sqlide/recordset_text_storage.cpp
-+++ b/backend/wbpublic/sqlide/recordset_text_storage.cpp
-@@ -203,7 +203,7 @@ void Recordset_text_storage::do_serialize(const Recordset
*recordset, sqlite::co
- 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))
- {
-@@ -212,7 +212,7 @@ void Recordset_text_storage::do_serialize(const Recordset
*recordset, sqlite::co
- if (!post_tpl)
- g_warning("Failed to open template file: `%s`",
post_tpl_path.c_str());
- else
-- post_tpl->ReloadIfChanged();
-+ ctemplate::Template::ReloadAllIfChanged();
- }
- }
-
-@@ -221,7 +221,7 @@ void Recordset_text_storage::do_serialize(const Recordset
*recordset, sqlite::co
- throw std::runtime_error(strfmt("Failed to open output file: `%s`",
_file_path.c_str()));
- }
-
-- tpl->ReloadIfChanged();
-+ ctemplate::Template::ReloadAllIfChanged();
-
- std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
- BOOST_FOREACH (const Parameters::value_type ¶m, _parameters)
Deleted: 0003-mysql-workbench-keyring.patch
===================================================================
--- 0003-mysql-workbench-keyring.patch 2015-03-03 13:02:47 UTC (rev 128620)
+++ 0003-mysql-workbench-keyring.patch 2015-03-03 13:27:08 UTC (rev 128621)
@@ -1,17 +0,0 @@
-diff --git a/frontend/linux/workbench/mysql-workbench.in
b/frontend/linux/workbench/mysql-workbench.in
-index 77d60ac..6199b46 100755
---- a/frontend/linux/workbench/mysql-workbench.in
-+++ b/frontend/linux/workbench/mysql-workbench.in
-@@ -4,6 +4,12 @@
- # This will cause passwords to be stored only temporarily for the session.
- #WB_NO_GNOME_KEYRING=1
-
-+# GNOME keyring does no longer export GNOME_KEYRING_CONTROL and MySQL
Workbench
-+# fails to detect it. So simply export here when executable is found.
-+if test -x "/usr/bin/gnome-keyring-daemon"; then
-+ export GNOME_KEYRING_CONTROL=1
-+fi
-+
- # force disable the Mac style single menu hack in Ubuntu Unity
- UBUNTU_MENUPROXY=0
-
Deleted: 0004-mysql-workbench-paramiko.patch
===================================================================
--- 0004-mysql-workbench-paramiko.patch 2015-03-03 13:02:47 UTC (rev 128620)
+++ 0004-mysql-workbench-paramiko.patch 2015-03-03 13:27:08 UTC (rev 128621)
@@ -1,23 +0,0 @@
-diff --git a/plugins/wb.admin/backend/wb_admin_ssh.py
b/plugins/wb.admin/backend/wb_admin_ssh.py
-index 11401aa..fa0ff71 100644
---- 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(paramiko.__version__) >= (1, 7, 4):
- 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(paramiko.__version__) >= (1, 7, 4):
- 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)
Deleted: 0005-mysql-workbench-py-append.patch
===================================================================
--- 0005-mysql-workbench-py-append.patch 2015-03-03 13:02:47 UTC (rev
128620)
+++ 0005-mysql-workbench-py-append.patch 2015-03-03 13:27:08 UTC (rev
128621)
@@ -1,18 +0,0 @@
-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))
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-03 13:02:47 UTC (rev 128620)
+++ PKGBUILD 2015-03-03 13:27:08 UTC (rev 128621)
@@ -6,8 +6,8 @@
# Contributor: Ionut Biru <ib...@archlinux.org>
pkgname=mysql-workbench
-pkgver=6.2.4
-pkgrel=9
+pkgver=6.2.5
+pkgrel=1
pkgdesc='A cross-platform, visual database design tool developed by MySQL'
arch=('i686' 'x86_64')
url='https://www.mysql.com/products/workbench/'
@@ -26,21 +26,13 @@
source=("http://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
'http://www.antlr3.org/download/antlr-3.4-complete.jar'
'0001-mysql-workbench-no-check-for-updates.patch'
- '0002-mysql-workbench-ctemplate.patch'
- '0003-mysql-workbench-keyring.patch'
- '0004-mysql-workbench-paramiko.patch'
- '0005-mysql-workbench-py-append.patch'
'0006-mysql-workbench-column-label.patch'
'0007-mysql-workbench-no-set-gtid-purged.patch'
'arch_linux_profile.xml')
-sha256sums=('b3e0775b7725fde3be8a63b6b1fd293a41bb6cbbc9dc459924b774fb4ad1afaa'
+sha256sums=('40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e'
'SKIP'
'9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
- 'c2e01e57a213383445dbf49222e32f3e35c96f199fb7b62fbecabfa0eb1b8f0b'
- '683a60e2bb38d8687f7e5228b49f62b374bf2c93488bdb89307205dbf5b3c476'
- 'b58e605b58a8d30662b444e315a0c5dd84e24e0a7701aa1aaf161e1b60c5790f'
- 'be232de2a22245bf350eb17c50292f9869195310c64f0cf41941df179a8ed586'
'701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
'28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
@@ -52,20 +44,6 @@
# Updates are provided via Arch Linux packages
patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch
- # fix deprecated calls to tpl->ReloadIfChanged
- # http://bugs.mysql.com/72585
- patch -Np1 < "${srcdir}"/0002-mysql-workbench-ctemplate.patch
-
- # fix GNOME keyring >= 3.14
- # http://bugs.mysql.com/74771
- patch -Np1 < "${srcdir}"/0003-mysql-workbench-keyring.patch
-
- # fix SSH tunnel
- patch -Np1 < "${srcdir}"/0004-mysql-workbench-paramiko.patch
-
- # fix python syntax error
- patch -Np1 < "${srcdir}"/0005-mysql-workbench-py-append.patch
-
# fix schema and table inspector with mysql-connector-c++ >= 1.1.5
patch -Np1 < "${srcdir}"/0006-mysql-workbench-column-label.patch
