[arch-commits] Commit in mysql-workbench/trunk (12 files)
Christian Hesse
eworm at archlinux.org
Wed Jan 28 09:13:18 UTC 2015
Date: Wednesday, January 28, 2015 @ 10:13:17
Author: eworm
Revision: 126686
upgpkg: mysql-workbench 6.2.4-7
* clean up patches
* add fix for schema and table inspector
Added:
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch
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
mysql-workbench/trunk/0006-mysql-workbench-column-label.patch
Modified:
mysql-workbench/trunk/PKGBUILD
Deleted:
mysql-workbench/trunk/mysql-workbench-ctemplate.patch
mysql-workbench/trunk/mysql-workbench-keyring.patch
mysql-workbench/trunk/mysql-workbench-no-check-for-updates.patch
mysql-workbench/trunk/mysql-workbench-paramiko.patch
mysql-workbench/trunk/mysql-workbench-py-append.patch
-------------------------------------------------+
0001-mysql-workbench-no-check-for-updates.patch | 21 ++++++++++
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 +++++++++
0006-mysql-workbench-column-label.patch | 44 ++++++++++++++++++++++
PKGBUILD | 35 ++++++++++-------
mysql-workbench-ctemplate.patch | 29 --------------
mysql-workbench-keyring.patch | 17 --------
mysql-workbench-no-check-for-updates.patch | 21 ----------
mysql-workbench-paramiko.patch | 22 -----------
mysql-workbench-py-append.patch | 33 ----------------
12 files changed, 174 insertions(+), 137 deletions(-)
Added: 0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- 0001-mysql-workbench-no-check-for-updates.patch (rev 0)
+++ 0001-mysql-workbench-no-check-for-updates.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="itemType">action</value>
+ </value>
+
++ <!-- We build a package that should be updated via pacman, so disable this check.
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ </value>
+@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="name">checkUpdate</value>
+ <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+- </value>
++ </value> //-->
+
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
Added: 0002-mysql-workbench-ctemplate.patch
===================================================================
--- 0002-mysql-workbench-ctemplate.patch (rev 0)
+++ 0002-mysql-workbench-ctemplate.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -0,0 +1,31 @@
+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)
Added: 0003-mysql-workbench-keyring.patch
===================================================================
--- 0003-mysql-workbench-keyring.patch (rev 0)
+++ 0003-mysql-workbench-keyring.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -0,0 +1,17 @@
+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
+
Added: 0004-mysql-workbench-paramiko.patch
===================================================================
--- 0004-mysql-workbench-paramiko.patch (rev 0)
+++ 0004-mysql-workbench-paramiko.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -0,0 +1,23 @@
+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)
Added: 0005-mysql-workbench-py-append.patch
===================================================================
--- 0005-mysql-workbench-py-append.patch (rev 0)
+++ 0005-mysql-workbench-py-append.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -0,0 +1,18 @@
+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))
Added: 0006-mysql-workbench-column-label.patch
===================================================================
--- 0006-mysql-workbench-column-label.patch (rev 0)
+++ 0006-mysql-workbench-column-label.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -0,0 +1,44 @@
+diff --git a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
+index 1b69f22..82de11f 100644
+--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
++++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
+@@ -241,7 +241,11 @@ public:
+ const int last_column= meta->getColumnCount();
+ for (int i = 1; i <= last_column; i++)
+ {
++#ifdef MYSQLCPPCONN_VERSION_1_1_5
++ column_by_name[meta->getColumnLabel(i)]= i;
++#else
+ column_by_name[meta->getColumnName(i)]= i;
++#endif
+
+ std::string type;
+ switch (meta->getColumnType(i))
+@@ -308,7 +312,11 @@ public:
+ db_query_ResultsetColumnRef column(aself->get_grt());
+
+ column->owner(aself);
++#ifdef MYSQLCPPCONN_VERSION_1_1_5
++ column->name(std::string(meta->getColumnLabel(i)));
++#else
+ column->name(std::string(meta->getColumnName(i)));
++#endif
+ column->columnType(type);
+
+ self->columns().insert(column);
+diff --git a/modules/db.mysql.query/src/dbquery.cpp b/modules/db.mysql.query/src/dbquery.cpp
+index 428bad3..74db1dc 100644
+--- a/modules/db.mysql.query/src/dbquery.cpp
++++ b/modules/db.mysql.query/src/dbquery.cpp
+@@ -521,7 +521,11 @@ std::string DbMySQLQueryImpl::resultFieldName(int result, int field)
+ throw std::invalid_argument("Invalid resultset");
+ sql::ResultSet *res = _resultsets[result];
+
++#ifdef MYSQLCPPCONN_VERSION_1_1_5
++ return res->getMetaData()->getColumnLabel(field);
++#else
+ return res->getMetaData()->getColumnName(field);
++#endif
+ }
+
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-28 08:32:29 UTC (rev 126685)
+++ PKGBUILD 2015-01-28 09:13:17 UTC (rev 126686)
@@ -7,7 +7,7 @@
pkgname=mysql-workbench
pkgver=6.2.4
-pkgrel=5
+pkgrel=7
pkgdesc='A cross-platform, visual database design tool developed by MySQL'
arch=('i686' 'x86_64')
url='https://www.mysql.com/products/workbench/'
@@ -25,20 +25,22 @@
validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
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'
- 'mysql-workbench-ctemplate.patch'
- 'mysql-workbench-keyring.patch'
- 'mysql-workbench-no-check-for-updates.patch'
- 'mysql-workbench-paramiko.patch'
- 'mysql-workbench-py-append.patch'
+ '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'
'arch_linux_profile.xml')
sha256sums=('b3e0775b7725fde3be8a63b6b1fd293a41bb6cbbc9dc459924b774fb4ad1afaa'
'SKIP'
'9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
- 'bbf6f3e56847cc012634e262295f34eaaa43ef32d04e1ec291315dabd6613042'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ 'c2e01e57a213383445dbf49222e32f3e35c96f199fb7b62fbecabfa0eb1b8f0b'
'683a60e2bb38d8687f7e5228b49f62b374bf2c93488bdb89307205dbf5b3c476'
- '996482e15d88af097f5e7a578885338cad5b8724f8abb4341749d5538801f5c0'
- '9c8d9a2c32ef63f2fd1f1062d42ab0b77f8c28fa77d05ded7b1c0a98be626d71'
- '13a5c9035a6f545d4fa065e60a10ed502876d0236b925540e190bda86179ef38'
+ 'b58e605b58a8d30662b444e315a0c5dd84e24e0a7701aa1aaf161e1b60c5790f'
+ 'be232de2a22245bf350eb17c50292f9869195310c64f0cf41941df179a8ed586'
+ '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
'28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
prepare() {
@@ -46,22 +48,25 @@
# Disable 'Help' -> 'Check for Updates'
# Updates are provided via Arch Linux packages
- patch -Np1 < "${srcdir}"/mysql-workbench-no-check-for-updates.patch
+ 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}"/mysql-workbench-ctemplate.patch
+ patch -Np1 < "${srcdir}"/0002-mysql-workbench-ctemplate.patch
# fix GNOME keyring >= 3.14
# http://bugs.mysql.com/74771
- patch -Np1 < "${srcdir}"/mysql-workbench-keyring.patch
+ patch -Np1 < "${srcdir}"/0003-mysql-workbench-keyring.patch
# fix SSH tunnel
- patch -Np1 < "${srcdir}"/mysql-workbench-paramiko.patch
+ patch -Np1 < "${srcdir}"/0004-mysql-workbench-paramiko.patch
# fix python syntax error
- patch -Np1 < "${srcdir}"/mysql-workbench-py-append.patch
+ 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
+
# fix GDAL
sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h
Deleted: mysql-workbench-ctemplate.patch
===================================================================
--- mysql-workbench-ctemplate.patch 2015-01-28 08:32:29 UTC (rev 126685)
+++ mysql-workbench-ctemplate.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -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<TemplateDictionary> dict(new TemplateDictionary("/"));
- BOOST_FOREACH (const Parameters::value_type ¶m, _parameters)
\ No newline at end of file
Deleted: mysql-workbench-keyring.patch
===================================================================
--- mysql-workbench-keyring.patch 2015-01-28 08:32:29 UTC (rev 126685)
+++ mysql-workbench-keyring.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -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: mysql-workbench-no-check-for-updates.patch
===================================================================
--- mysql-workbench-no-check-for-updates.patch 2015-01-28 08:32:29 UTC (rev 126685)
+++ mysql-workbench-no-check-for-updates.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -1,21 +0,0 @@
-diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
-index 3bfb79a..7efa4e7 100644
---- a/res/wbdata/main_menu.xml
-+++ b/res/wbdata/main_menu.xml
-@@ -2665,6 +2665,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="itemType">action</value>
- </value>
-
-+ <!-- We build a package that should be updated via pacman, so disable this check.
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -2675,7 +2676,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="name">checkUpdate</value>
- <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
- <value type="string" key="itemType">action</value>
-- </value>
-+ </value> //-->
-
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
Deleted: mysql-workbench-paramiko.patch
===================================================================
--- mysql-workbench-paramiko.patch 2015-01-28 08:32:29 UTC (rev 126685)
+++ mysql-workbench-paramiko.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -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)
Deleted: mysql-workbench-py-append.patch
===================================================================
--- mysql-workbench-py-append.patch 2015-01-28 08:32:29 UTC (rev 126685)
+++ mysql-workbench-py-append.patch 2015-01-28 09:13:17 UTC (rev 126686)
@@ -1,33 +0,0 @@
-From be3bb1110f1fd8af7ecf50e9524ce037200abf51 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-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 <mail at eworm.de>
----
- 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
-
More information about the arch-commits
mailing list