Date: Thursday, February 12, 2015 @ 10:37:59
Author: eworm
Revision: 127590
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
mysql-workbench/repos/community-testing-i686/
mysql-workbench/repos/community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch
(from rev 127589,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-testing-i686/0002-mysql-workbench-ctemplate.patch
(from rev 127589,
mysql-workbench/trunk/0002-mysql-workbench-ctemplate.patch)
mysql-workbench/repos/community-testing-i686/0003-mysql-workbench-keyring.patch
(from rev 127589, mysql-workbench/trunk/0003-mysql-workbench-keyring.patch)
mysql-workbench/repos/community-testing-i686/0004-mysql-workbench-paramiko.patch
(from rev 127589, mysql-workbench/trunk/0004-mysql-workbench-paramiko.patch)
mysql-workbench/repos/community-testing-i686/0005-mysql-workbench-py-append.patch
(from rev 127589,
mysql-workbench/trunk/0005-mysql-workbench-py-append.patch)
mysql-workbench/repos/community-testing-i686/0006-mysql-workbench-column-label.patch
(from rev 127589,
mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
mysql-workbench/repos/community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch
(from rev 127589,
mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
mysql-workbench/repos/community-testing-i686/PKGBUILD
(from rev 127589, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-testing-i686/arch_linux_profile.xml
(from rev 127589, mysql-workbench/trunk/arch_linux_profile.xml)
mysql-workbench/repos/community-testing-i686/mysql-workbench.install
(from rev 127589, mysql-workbench/trunk/mysql-workbench.install)
mysql-workbench/repos/community-testing-x86_64/
mysql-workbench/repos/community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 127589,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-testing-x86_64/0002-mysql-workbench-ctemplate.patch
(from rev 127589,
mysql-workbench/trunk/0002-mysql-workbench-ctemplate.patch)
mysql-workbench/repos/community-testing-x86_64/0003-mysql-workbench-keyring.patch
(from rev 127589, mysql-workbench/trunk/0003-mysql-workbench-keyring.patch)
mysql-workbench/repos/community-testing-x86_64/0004-mysql-workbench-paramiko.patch
(from rev 127589, mysql-workbench/trunk/0004-mysql-workbench-paramiko.patch)
mysql-workbench/repos/community-testing-x86_64/0005-mysql-workbench-py-append.patch
(from rev 127589,
mysql-workbench/trunk/0005-mysql-workbench-py-append.patch)
mysql-workbench/repos/community-testing-x86_64/0006-mysql-workbench-column-label.patch
(from rev 127589,
mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
mysql-workbench/repos/community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch
(from rev 127589,
mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
mysql-workbench/repos/community-testing-x86_64/PKGBUILD
(from rev 127589, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-testing-x86_64/arch_linux_profile.xml
(from rev 127589, mysql-workbench/trunk/arch_linux_profile.xml)
mysql-workbench/repos/community-testing-x86_64/mysql-workbench.install
(from rev 127589, mysql-workbench/trunk/mysql-workbench.install)
--------------------------------------------------------------------------+
community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch |
21 ++
community-testing-i686/0002-mysql-workbench-ctemplate.patch |
31 +++
community-testing-i686/0003-mysql-workbench-keyring.patch |
17 +
community-testing-i686/0004-mysql-workbench-paramiko.patch |
23 ++
community-testing-i686/0005-mysql-workbench-py-append.patch |
18 +
community-testing-i686/0006-mysql-workbench-column-label.patch |
44 ++++
community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch |
29 ++
community-testing-i686/PKGBUILD |
100 ++++++++++
community-testing-i686/mysql-workbench.install |
14 +
community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch |
21 ++
community-testing-x86_64/0002-mysql-workbench-ctemplate.patch |
31 +++
community-testing-x86_64/0003-mysql-workbench-keyring.patch |
17 +
community-testing-x86_64/0004-mysql-workbench-paramiko.patch |
23 ++
community-testing-x86_64/0005-mysql-workbench-py-append.patch |
18 +
community-testing-x86_64/0006-mysql-workbench-column-label.patch |
44 ++++
community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch |
29 ++
community-testing-x86_64/PKGBUILD |
100 ++++++++++
community-testing-x86_64/mysql-workbench.install |
14 +
18 files changed, 594 insertions(+)
Copied:
mysql-workbench/repos/community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch
(from rev 127589,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch
(rev 0)
+++ community-testing-i686/0001-mysql-workbench-no-check-for-updates.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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>
Copied:
mysql-workbench/repos/community-testing-i686/0002-mysql-workbench-ctemplate.patch
(from rev 127589, mysql-workbench/trunk/0002-mysql-workbench-ctemplate.patch)
===================================================================
--- community-testing-i686/0002-mysql-workbench-ctemplate.patch
(rev 0)
+++ community-testing-i686/0002-mysql-workbench-ctemplate.patch 2015-02-12
09:37:59 UTC (rev 127590)
@@ -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)
Copied:
mysql-workbench/repos/community-testing-i686/0003-mysql-workbench-keyring.patch
(from rev 127589, mysql-workbench/trunk/0003-mysql-workbench-keyring.patch)
===================================================================
--- community-testing-i686/0003-mysql-workbench-keyring.patch
(rev 0)
+++ community-testing-i686/0003-mysql-workbench-keyring.patch 2015-02-12
09:37:59 UTC (rev 127590)
@@ -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
+
Copied:
mysql-workbench/repos/community-testing-i686/0004-mysql-workbench-paramiko.patch
(from rev 127589, mysql-workbench/trunk/0004-mysql-workbench-paramiko.patch)
===================================================================
--- community-testing-i686/0004-mysql-workbench-paramiko.patch
(rev 0)
+++ community-testing-i686/0004-mysql-workbench-paramiko.patch 2015-02-12
09:37:59 UTC (rev 127590)
@@ -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)
Copied:
mysql-workbench/repos/community-testing-i686/0005-mysql-workbench-py-append.patch
(from rev 127589, mysql-workbench/trunk/0005-mysql-workbench-py-append.patch)
===================================================================
--- community-testing-i686/0005-mysql-workbench-py-append.patch
(rev 0)
+++ community-testing-i686/0005-mysql-workbench-py-append.patch 2015-02-12
09:37:59 UTC (rev 127590)
@@ -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))
Copied:
mysql-workbench/repos/community-testing-i686/0006-mysql-workbench-column-label.patch
(from rev 127589,
mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
===================================================================
--- community-testing-i686/0006-mysql-workbench-column-label.patch
(rev 0)
+++ community-testing-i686/0006-mysql-workbench-column-label.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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
+ }
+
+
Copied:
mysql-workbench/repos/community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch
(from rev 127589,
mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
===================================================================
--- community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch
(rev 0)
+++ community-testing-i686/0007-mysql-workbench-no-set-gtid-purged.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -0,0 +1,29 @@
+diff --git a/plugins/wb.admin/frontend/wb_admin_export.py
b/plugins/wb.admin/frontend/wb_admin_export.py
+index 40f5167..ebf6c3d 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export.py
++++ b/plugins/wb.admin/frontend/wb_admin_export.py
+@@ -1858,8 +1858,6 @@ class WbAdminExportTab(WbAdminSchemaListTab):
+ args.append("--ssl-cipher=%s" % conn["sslCipher"])
+
+ # Sets the compatibility parameters if needed
+- if self._compatibility_params:
+- args.append("--set-gtid-purged=OFF")
+ if conn.get("OPT_ENABLE_CLEARTEXT_PLUGIN", ""):
+ args.append("--enable-cleartext-plugin")
+
+diff --git a/plugins/wb.admin/frontend/wb_admin_export_options.py
b/plugins/wb.admin/frontend/wb_admin_export_options.py
+index e9ec2e7..653f531 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export_options.py
++++ b/plugins/wb.admin/frontend/wb_admin_export_options.py
+@@ -53,9 +53,9 @@ export_options = {
+ "order-by-primary":["Dump each table's rows sorted by its primary key, or
by its first unique index.","FALSE"],
+ "dump-date":["Include dump date as \"Dump completed on\" comment if
--comments is given.","TRUE"],
+ "$internal$show-internal-schemas":["Show internal MySQL schemas (mysql,
information_schema, performance_schema) in the export schema list.","FALSE"],
+- "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"],
++ "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"]
+ # "xml":["Produce XML output.","FALSE"]
+- "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the
output.","AUTO","STR",("5.6.9", None)]
++# "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the
output.","AUTO","STR",("5.6.9", None)]
+ }
+
+ }
Copied: mysql-workbench/repos/community-testing-i686/PKGBUILD (from rev 127589,
mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2015-02-12 09:37:59 UTC (rev 127590)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Contributor: Alexandre Boily <alexandrebo...@gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalc...@gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.2.4
+pkgrel=9
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('python2' 'libzip' 'libmariadbclient' 'lua51' 'gtkmm' 'ctemplate'
+ 'libgnome-keyring' 'libgl' 'python2-paramiko' 'python2-pexpect' 'gdal'
+ 'pcre' 'tinyxml' 'libxml2' 'mysql-python' 'cairo'
+ 'python2-cairo' 'hicolor-icon-theme' 'desktop-file-utils' 'libiodbc'
+ 'mysql-connector-c++' 'vsqlite++' 'unixodbc' 'freetype2'
+ 'libantlr3c')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password
manager'
+ 'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'curl' 'mesa' 'swig2' 'java-runtime')
+install=mysql-workbench.install
+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'
+ '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'
+ 'SKIP'
+ '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ 'c2e01e57a213383445dbf49222e32f3e35c96f199fb7b62fbecabfa0eb1b8f0b'
+ '683a60e2bb38d8687f7e5228b49f62b374bf2c93488bdb89307205dbf5b3c476'
+ 'b58e605b58a8d30662b444e315a0c5dd84e24e0a7701aa1aaf161e1b60c5790f'
+ 'be232de2a22245bf350eb17c50292f9869195310c64f0cf41941df179a8ed586'
+ '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
+ 'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
+ '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
+
+prepare() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # Disable 'Help' -> 'Check for Updates'
+ # 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
+
+ # mysqldump from mariadb (currently 1.0.16) does not support
--set-gtid-purged
+ patch -Np1 < "${srcdir}"/0007-mysql-workbench-no-set-gtid-purged.patch
+
+ # fix GDAL
+ sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h
backend/wbpublic/grt/spatial_handler.h
+
+ # put antlr into place
+ install -D ${srcdir}/antlr-3.4-complete.jar
${srcdir}/linux-res/bin/antlr-3.4-complete.jar
+}
+
+build() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DSWIG_EXECUTABLE=/usr/bin/swig-2
+
+ make
+}
+
+package() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+
"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB_5.5_Package\).xml
+}
+
Copied: mysql-workbench/repos/community-testing-i686/arch_linux_profile.xml
(from rev 127589, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-testing-i686/mysql-workbench.install
(from rev 127589, mysql-workbench/trunk/mysql-workbench.install)
===================================================================
--- community-testing-i686/mysql-workbench.install
(rev 0)
+++ community-testing-i686/mysql-workbench.install 2015-02-12 09:37:59 UTC
(rev 127590)
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+ update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Copied:
mysql-workbench/repos/community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 127589,
mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(rev 0)
+++ community-testing-x86_64/0001-mysql-workbench-no-check-for-updates.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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>
Copied:
mysql-workbench/repos/community-testing-x86_64/0002-mysql-workbench-ctemplate.patch
(from rev 127589, mysql-workbench/trunk/0002-mysql-workbench-ctemplate.patch)
===================================================================
--- community-testing-x86_64/0002-mysql-workbench-ctemplate.patch
(rev 0)
+++ community-testing-x86_64/0002-mysql-workbench-ctemplate.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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)
Copied:
mysql-workbench/repos/community-testing-x86_64/0003-mysql-workbench-keyring.patch
(from rev 127589, mysql-workbench/trunk/0003-mysql-workbench-keyring.patch)
===================================================================
--- community-testing-x86_64/0003-mysql-workbench-keyring.patch
(rev 0)
+++ community-testing-x86_64/0003-mysql-workbench-keyring.patch 2015-02-12
09:37:59 UTC (rev 127590)
@@ -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
+
Copied:
mysql-workbench/repos/community-testing-x86_64/0004-mysql-workbench-paramiko.patch
(from rev 127589, mysql-workbench/trunk/0004-mysql-workbench-paramiko.patch)
===================================================================
--- community-testing-x86_64/0004-mysql-workbench-paramiko.patch
(rev 0)
+++ community-testing-x86_64/0004-mysql-workbench-paramiko.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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)
Copied:
mysql-workbench/repos/community-testing-x86_64/0005-mysql-workbench-py-append.patch
(from rev 127589, mysql-workbench/trunk/0005-mysql-workbench-py-append.patch)
===================================================================
--- community-testing-x86_64/0005-mysql-workbench-py-append.patch
(rev 0)
+++ community-testing-x86_64/0005-mysql-workbench-py-append.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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))
Copied:
mysql-workbench/repos/community-testing-x86_64/0006-mysql-workbench-column-label.patch
(from rev 127589,
mysql-workbench/trunk/0006-mysql-workbench-column-label.patch)
===================================================================
--- community-testing-x86_64/0006-mysql-workbench-column-label.patch
(rev 0)
+++ community-testing-x86_64/0006-mysql-workbench-column-label.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -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
+ }
+
+
Copied:
mysql-workbench/repos/community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch
(from rev 127589,
mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
===================================================================
--- community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch
(rev 0)
+++ community-testing-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch
2015-02-12 09:37:59 UTC (rev 127590)
@@ -0,0 +1,29 @@
+diff --git a/plugins/wb.admin/frontend/wb_admin_export.py
b/plugins/wb.admin/frontend/wb_admin_export.py
+index 40f5167..ebf6c3d 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export.py
++++ b/plugins/wb.admin/frontend/wb_admin_export.py
+@@ -1858,8 +1858,6 @@ class WbAdminExportTab(WbAdminSchemaListTab):
+ args.append("--ssl-cipher=%s" % conn["sslCipher"])
+
+ # Sets the compatibility parameters if needed
+- if self._compatibility_params:
+- args.append("--set-gtid-purged=OFF")
+ if conn.get("OPT_ENABLE_CLEARTEXT_PLUGIN", ""):
+ args.append("--enable-cleartext-plugin")
+
+diff --git a/plugins/wb.admin/frontend/wb_admin_export_options.py
b/plugins/wb.admin/frontend/wb_admin_export_options.py
+index e9ec2e7..653f531 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export_options.py
++++ b/plugins/wb.admin/frontend/wb_admin_export_options.py
+@@ -53,9 +53,9 @@ export_options = {
+ "order-by-primary":["Dump each table's rows sorted by its primary key, or
by its first unique index.","FALSE"],
+ "dump-date":["Include dump date as \"Dump completed on\" comment if
--comments is given.","TRUE"],
+ "$internal$show-internal-schemas":["Show internal MySQL schemas (mysql,
information_schema, performance_schema) in the export schema list.","FALSE"],
+- "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"],
++ "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"]
+ # "xml":["Produce XML output.","FALSE"]
+- "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the
output.","AUTO","STR",("5.6.9", None)]
++# "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the
output.","AUTO","STR",("5.6.9", None)]
+ }
+
+ }
Copied: mysql-workbench/repos/community-testing-x86_64/PKGBUILD (from rev
127589, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2015-02-12 09:37:59 UTC (rev 127590)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Contributor: Alexandre Boily <alexandrebo...@gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalc...@gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.2.4
+pkgrel=9
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+depends=('python2' 'libzip' 'libmariadbclient' 'lua51' 'gtkmm' 'ctemplate'
+ 'libgnome-keyring' 'libgl' 'python2-paramiko' 'python2-pexpect' 'gdal'
+ 'pcre' 'tinyxml' 'libxml2' 'mysql-python' 'cairo'
+ 'python2-cairo' 'hicolor-icon-theme' 'desktop-file-utils' 'libiodbc'
+ 'mysql-connector-c++' 'vsqlite++' 'unixodbc' 'freetype2'
+ 'libantlr3c')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password
manager'
+ 'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'curl' 'mesa' 'swig2' 'java-runtime')
+install=mysql-workbench.install
+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'
+ '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'
+ 'SKIP'
+ '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ 'c2e01e57a213383445dbf49222e32f3e35c96f199fb7b62fbecabfa0eb1b8f0b'
+ '683a60e2bb38d8687f7e5228b49f62b374bf2c93488bdb89307205dbf5b3c476'
+ 'b58e605b58a8d30662b444e315a0c5dd84e24e0a7701aa1aaf161e1b60c5790f'
+ 'be232de2a22245bf350eb17c50292f9869195310c64f0cf41941df179a8ed586'
+ '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
+ 'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
+ '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
+
+prepare() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # Disable 'Help' -> 'Check for Updates'
+ # 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
+
+ # mysqldump from mariadb (currently 1.0.16) does not support
--set-gtid-purged
+ patch -Np1 < "${srcdir}"/0007-mysql-workbench-no-set-gtid-purged.patch
+
+ # fix GDAL
+ sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h
backend/wbpublic/grt/spatial_handler.h
+
+ # put antlr into place
+ install -D ${srcdir}/antlr-3.4-complete.jar
${srcdir}/linux-res/bin/antlr-3.4-complete.jar
+}
+
+build() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DSWIG_EXECUTABLE=/usr/bin/swig-2
+
+ make
+}
+
+package() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+
"${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB_5.5_Package\).xml
+}
+
Copied: mysql-workbench/repos/community-testing-x86_64/arch_linux_profile.xml
(from rev 127589, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-testing-x86_64/mysql-workbench.install
(from rev 127589, mysql-workbench/trunk/mysql-workbench.install)
===================================================================
--- community-testing-x86_64/mysql-workbench.install
(rev 0)
+++ community-testing-x86_64/mysql-workbench.install 2015-02-12 09:37:59 UTC
(rev 127590)
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+ update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
