Date: Friday, January 16, 2015 @ 23:02:19 Author: eworm Revision: 126017
Initial import of mysql-workbench 6.2.4-5 Added: mysql-workbench/ mysql-workbench/repos/ mysql-workbench/trunk/ mysql-workbench/trunk/PKGBUILD mysql-workbench/trunk/arch_linux_profile.xml 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 mysql-workbench/trunk/mysql-workbench.install --------------------------------------------+ PKGBUILD | 89 +++++++++++++++++++++++++++ arch_linux_profile.xml | 1 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 ++++++++++ mysql-workbench.install | 14 ++++ 8 files changed, 226 insertions(+) Added: mysql-workbench/trunk/PKGBUILD =================================================================== --- mysql-workbench/trunk/PKGBUILD (rev 0) +++ mysql-workbench/trunk/PKGBUILD 2015-01-16 22:02:19 UTC (rev 126017) @@ -0,0 +1,89 @@ +# Maintainer: Christian Hesse <[email protected]> +# Contributor: Alexandre Boily <[email protected]> +# Contributor: Illarion Kovalchuk <[email protected]> +# Contributor: totoloco <totoloco at gmail _dot_com> +# Contributor: Ionut Biru <[email protected]> + +pkgname=mysql-workbench +pkgver=6.2.4 +pkgrel=5 +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' 'python2-pysqlite' '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' + 'mysql-workbench-ctemplate.patch' + 'mysql-workbench-keyring.patch' + 'mysql-workbench-no-check-for-updates.patch' + 'mysql-workbench-paramiko.patch' + 'mysql-workbench-py-append.patch' + 'arch_linux_profile.xml') +sha256sums=('b3e0775b7725fde3be8a63b6b1fd293a41bb6cbbc9dc459924b774fb4ad1afaa' + 'SKIP' + '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7' + 'bbf6f3e56847cc012634e262295f34eaaa43ef32d04e1ec291315dabd6613042' + '683a60e2bb38d8687f7e5228b49f62b374bf2c93488bdb89307205dbf5b3c476' + '996482e15d88af097f5e7a578885338cad5b8724f8abb4341749d5538801f5c0' + '9c8d9a2c32ef63f2fd1f1062d42ab0b77f8c28fa77d05ded7b1c0a98be626d71' + '13a5c9035a6f545d4fa065e60a10ed502876d0236b925540e190bda86179ef38' + '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e') + +prepare() { + cd "${srcdir}/mysql-workbench-community-${pkgver}-src/" + + # Disable 'Help' -> 'Check for Updates' + # Updates are provided via Arch Linux packages + patch -Np1 < "${srcdir}"/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 + + # fix GNOME keyring >= 3.14 + # http://bugs.mysql.com/74771 + patch -Np1 < "${srcdir}"/mysql-workbench-keyring.patch + + # fix SSH tunnel + patch -Np1 < "${srcdir}"/mysql-workbench-paramiko.patch + + # fix python syntax error + patch -Np1 < "${srcdir}"/mysql-workbench-py-append.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 +} + Property changes on: mysql-workbench/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: mysql-workbench/trunk/arch_linux_profile.xml =================================================================== (Binary files differ) Index: mysql-workbench/trunk/arch_linux_profile.xml =================================================================== --- mysql-workbench/trunk/arch_linux_profile.xml 2015-01-16 21:39:01 UTC (rev 126016) +++ mysql-workbench/trunk/arch_linux_profile.xml 2015-01-16 22:02:19 UTC (rev 126017) Property changes on: mysql-workbench/trunk/arch_linux_profile.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property Added: mysql-workbench/trunk/mysql-workbench-ctemplate.patch =================================================================== --- mysql-workbench/trunk/mysql-workbench-ctemplate.patch (rev 0) +++ mysql-workbench/trunk/mysql-workbench-ctemplate.patch 2015-01-16 22:02:19 UTC (rev 126017) @@ -0,0 +1,29 @@ +--- 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 Added: mysql-workbench/trunk/mysql-workbench-keyring.patch =================================================================== --- mysql-workbench/trunk/mysql-workbench-keyring.patch (rev 0) +++ mysql-workbench/trunk/mysql-workbench-keyring.patch 2015-01-16 22:02:19 UTC (rev 126017) @@ -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: mysql-workbench/trunk/mysql-workbench-no-check-for-updates.patch =================================================================== --- mysql-workbench/trunk/mysql-workbench-no-check-for-updates.patch (rev 0) +++ mysql-workbench/trunk/mysql-workbench-no-check-for-updates.patch 2015-01-16 22:02:19 UTC (rev 126017) @@ -0,0 +1,21 @@ +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> Added: mysql-workbench/trunk/mysql-workbench-paramiko.patch =================================================================== --- mysql-workbench/trunk/mysql-workbench-paramiko.patch (rev 0) +++ mysql-workbench/trunk/mysql-workbench-paramiko.patch 2015-01-16 22:02:19 UTC (rev 126017) @@ -0,0 +1,22 @@ +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) Added: mysql-workbench/trunk/mysql-workbench-py-append.patch =================================================================== --- mysql-workbench/trunk/mysql-workbench-py-append.patch (rev 0) +++ mysql-workbench/trunk/mysql-workbench-py-append.patch 2015-01-16 22:02:19 UTC (rev 126017) @@ -0,0 +1,33 @@ +From be3bb1110f1fd8af7ecf50e9524ce037200abf51 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +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 <[email protected]> +--- + 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 + Added: mysql-workbench/trunk/mysql-workbench.install =================================================================== --- mysql-workbench/trunk/mysql-workbench.install (rev 0) +++ mysql-workbench/trunk/mysql-workbench.install 2015-01-16 22:02:19 UTC (rev 126017) @@ -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 +} +
