[arch-commits] Commit in mysql-workbench/repos (16 files)

Christian Hesse eworm at archlinux.org
Sat May 9 19:45:04 UTC 2015 

    Date: Saturday, May 9, 2015 @ 21:45:04
  Author: eworm
Revision: 133141

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mysql-workbench/repos/community-staging-i686/
  mysql-workbench/repos/community-staging-i686/0001-mysql-workbench-no-check-for-updates.patch
    (from rev 133140, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
  mysql-workbench/repos/community-staging-i686/0007-mysql-workbench-no-set-gtid-purged.patch
    (from rev 133140, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
  mysql-workbench/repos/community-staging-i686/0009-mysql-workbench-gnome-keyring.patch
    (from rev 133140, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
  mysql-workbench/repos/community-staging-i686/0010-mysql-workbench-object.patch
    (from rev 133140, mysql-workbench/trunk/0010-mysql-workbench-object.patch)
  mysql-workbench/repos/community-staging-i686/PKGBUILD
    (from rev 133140, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-staging-i686/arch_linux_profile.xml
    (from rev 133140, mysql-workbench/trunk/arch_linux_profile.xml)
  mysql-workbench/repos/community-staging-i686/mysql-workbench.install
    (from rev 133140, mysql-workbench/trunk/mysql-workbench.install)
  mysql-workbench/repos/community-staging-x86_64/
  mysql-workbench/repos/community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch
    (from rev 133140, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
  mysql-workbench/repos/community-staging-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch
    (from rev 133140, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
  mysql-workbench/repos/community-staging-x86_64/0009-mysql-workbench-gnome-keyring.patch
    (from rev 133140, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
  mysql-workbench/repos/community-staging-x86_64/0010-mysql-workbench-object.patch
    (from rev 133140, mysql-workbench/trunk/0010-mysql-workbench-object.patch)
  mysql-workbench/repos/community-staging-x86_64/PKGBUILD
    (from rev 133140, mysql-workbench/trunk/PKGBUILD)
  mysql-workbench/repos/community-staging-x86_64/arch_linux_profile.xml
    (from rev 133140, mysql-workbench/trunk/arch_linux_profile.xml)
  mysql-workbench/repos/community-staging-x86_64/mysql-workbench.install
    (from rev 133140, mysql-workbench/trunk/mysql-workbench.install)

--------------------------------------------------------------------------+
 community-staging-i686/0001-mysql-workbench-no-check-for-updates.patch   |   21 ++
 community-staging-i686/0007-mysql-workbench-no-set-gtid-purged.patch     |   29 +++
 community-staging-i686/0009-mysql-workbench-gnome-keyring.patch          |   17 +
 community-staging-i686/0010-mysql-workbench-object.patch                 |   24 ++
 community-staging-i686/PKGBUILD                                          |   91 ++++++++++
 community-staging-i686/mysql-workbench.install                           |   14 +
 community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch |   21 ++
 community-staging-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch   |   29 +++
 community-staging-x86_64/0009-mysql-workbench-gnome-keyring.patch        |   17 +
 community-staging-x86_64/0010-mysql-workbench-object.patch               |   24 ++
 community-staging-x86_64/PKGBUILD                                        |   91 ++++++++++
 community-staging-x86_64/mysql-workbench.install                         |   14 +
 12 files changed, 392 insertions(+)

Copied: mysql-workbench/repos/community-staging-i686/0001-mysql-workbench-no-check-for-updates.patch (from rev 133140, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-staging-i686/0001-mysql-workbench-no-check-for-updates.patch	                        (rev 0)
+++ community-staging-i686/0001-mysql-workbench-no-check-for-updates.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -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-staging-i686/0007-mysql-workbench-no-set-gtid-purged.patch (from rev 133140, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
===================================================================
--- community-staging-i686/0007-mysql-workbench-no-set-gtid-purged.patch	                        (rev 0)
+++ community-staging-i686/0007-mysql-workbench-no-set-gtid-purged.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -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-staging-i686/0009-mysql-workbench-gnome-keyring.patch (from rev 133140, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
===================================================================
--- community-staging-i686/0009-mysql-workbench-gnome-keyring.patch	                        (rev 0)
+++ community-staging-i686/0009-mysql-workbench-gnome-keyring.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -0,0 +1,17 @@
+diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
+index 02a8061..f8176f6 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
+ 
++# Looks like WB expects gnome-keyring to be present as soon as XDG_RUNTIME_DIR
++# environment variable is set. Do an extra check here...
++if ! type gnome-keyring-daemon >/dev/null 2>/dev/null; then
++	export WB_NO_GNOME_KEYRING=1
++fi
++
+ # force disable the Mac style single menu hack in Ubuntu Unity
+ export UBUNTU_MENUPROXY=0
+ 

Copied: mysql-workbench/repos/community-staging-i686/0010-mysql-workbench-object.patch (from rev 133140, mysql-workbench/trunk/0010-mysql-workbench-object.patch)
===================================================================
--- community-staging-i686/0010-mysql-workbench-object.patch	                        (rev 0)
+++ community-staging-i686/0010-mysql-workbench-object.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -0,0 +1,24 @@
+diff --git a/plugins/migration/copytable/copytable.cpp b/plugins/migration/copytable/copytable.cpp
+index 7b760e0..ec05d11 100644
+--- a/plugins/migration/copytable/copytable.cpp
++++ b/plugins/migration/copytable/copytable.cpp
+@@ -1922,7 +1922,7 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const std::string &hostname, int port,
+   mysql_init(&_mysql);
+ #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
+ #if MYSQL_CHECK_VERSION(5,6,6)
+-  if (is_mysql_version_at_least(5,6,6))
++  if (MySQLCopyDataTarget::is_mysql_version_at_least(5,6,6))
+     mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
+ #endif
+ #endif
+@@ -2871,8 +2871,8 @@ bool MySQLCopyDataTarget::InsertBuffer::append_escaped(const char *data, size_t
+   // This function is used to create a legal SQL string that you can use in an SQL statement
+   // This is needed because the escaping depends on the character set in use by the server
+   #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
+-  #if MYSQL_CHECK_VERSION(5,7,6)
+-    if (is_mysql_version_at_least(5,7,6))
++  #if MYSQL_CHECK_VERSION(5,7,6) && not defined(MARIADB_BASE_VERSION)
++    if (MySQLCopyDataTarget::is_mysql_version_at_least(5,7,6))
+       length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength);
+     else
+       length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);

Copied: mysql-workbench/repos/community-staging-i686/PKGBUILD (from rev 133140, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-05-09 19:45:04 UTC (rev 133141)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.3.3
+pkgrel=2
+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' 'imagemagick')
+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'
+	'0007-mysql-workbench-no-set-gtid-purged.patch'
+	'0009-mysql-workbench-gnome-keyring.patch'
+	'0010-mysql-workbench-object.patch'
+	'arch_linux_profile.xml')
+sha256sums=('4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419'
+            'SKIP'
+            '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+            'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+            'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
+            '9c2ae2fe7a4f59502bdcf591a07353c350b0ba29c3935c8242d97848cc0e50d3'
+            'c8bbaee5d601333730bd200baa9514e880e4c5277b1241a67e267b602b400ded'
+            '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
+
+	# 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 gnome-keyring
+	patch -Np1 < "${srcdir}"/0009-mysql-workbench-gnome-keyring.patch
+
+	# fix cannot call member function without object
+	patch -Np1 < "${srcdir}"/0010-mysql-workbench-object.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
+
+	# icons
+	for SIZE in 16 24 32 48 64 96 128; do
+		convert -scale ${SIZE} \
+			images/icons/linux/128x128/apps/mysql-workbench.png \
+			${srcdir}/mysql-workbench.png
+		install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+	done
+
+	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-staging-i686/arch_linux_profile.xml (from rev 133140, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)

Copied: mysql-workbench/repos/community-staging-i686/mysql-workbench.install (from rev 133140, mysql-workbench/trunk/mysql-workbench.install)
===================================================================
--- community-staging-i686/mysql-workbench.install	                        (rev 0)
+++ community-staging-i686/mysql-workbench.install	2015-05-09 19:45:04 UTC (rev 133141)
@@ -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-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 133140, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch	                        (rev 0)
+++ community-staging-x86_64/0001-mysql-workbench-no-check-for-updates.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -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-staging-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch (from rev 133140, mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch)
===================================================================
--- community-staging-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch	                        (rev 0)
+++ community-staging-x86_64/0007-mysql-workbench-no-set-gtid-purged.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -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-staging-x86_64/0009-mysql-workbench-gnome-keyring.patch (from rev 133140, mysql-workbench/trunk/0009-mysql-workbench-gnome-keyring.patch)
===================================================================
--- community-staging-x86_64/0009-mysql-workbench-gnome-keyring.patch	                        (rev 0)
+++ community-staging-x86_64/0009-mysql-workbench-gnome-keyring.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -0,0 +1,17 @@
+diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
+index 02a8061..f8176f6 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
+ 
++# Looks like WB expects gnome-keyring to be present as soon as XDG_RUNTIME_DIR
++# environment variable is set. Do an extra check here...
++if ! type gnome-keyring-daemon >/dev/null 2>/dev/null; then
++	export WB_NO_GNOME_KEYRING=1
++fi
++
+ # force disable the Mac style single menu hack in Ubuntu Unity
+ export UBUNTU_MENUPROXY=0
+ 

Copied: mysql-workbench/repos/community-staging-x86_64/0010-mysql-workbench-object.patch (from rev 133140, mysql-workbench/trunk/0010-mysql-workbench-object.patch)
===================================================================
--- community-staging-x86_64/0010-mysql-workbench-object.patch	                        (rev 0)
+++ community-staging-x86_64/0010-mysql-workbench-object.patch	2015-05-09 19:45:04 UTC (rev 133141)
@@ -0,0 +1,24 @@
+diff --git a/plugins/migration/copytable/copytable.cpp b/plugins/migration/copytable/copytable.cpp
+index 7b760e0..ec05d11 100644
+--- a/plugins/migration/copytable/copytable.cpp
++++ b/plugins/migration/copytable/copytable.cpp
+@@ -1922,7 +1922,7 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const std::string &hostname, int port,
+   mysql_init(&_mysql);
+ #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
+ #if MYSQL_CHECK_VERSION(5,6,6)
+-  if (is_mysql_version_at_least(5,6,6))
++  if (MySQLCopyDataTarget::is_mysql_version_at_least(5,6,6))
+     mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
+ #endif
+ #endif
+@@ -2871,8 +2871,8 @@ bool MySQLCopyDataTarget::InsertBuffer::append_escaped(const char *data, size_t
+   // This function is used to create a legal SQL string that you can use in an SQL statement
+   // This is needed because the escaping depends on the character set in use by the server
+   #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
+-  #if MYSQL_CHECK_VERSION(5,7,6)
+-    if (is_mysql_version_at_least(5,7,6))
++  #if MYSQL_CHECK_VERSION(5,7,6) && not defined(MARIADB_BASE_VERSION)
++    if (MySQLCopyDataTarget::is_mysql_version_at_least(5,7,6))
+       length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength);
+     else
+       length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);

Copied: mysql-workbench/repos/community-staging-x86_64/PKGBUILD (from rev 133140, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-05-09 19:45:04 UTC (rev 133141)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.3.3
+pkgrel=2
+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' 'imagemagick')
+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'
+	'0007-mysql-workbench-no-set-gtid-purged.patch'
+	'0009-mysql-workbench-gnome-keyring.patch'
+	'0010-mysql-workbench-object.patch'
+	'arch_linux_profile.xml')
+sha256sums=('4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419'
+            'SKIP'
+            '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+            'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+            'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
+            '9c2ae2fe7a4f59502bdcf591a07353c350b0ba29c3935c8242d97848cc0e50d3'
+            'c8bbaee5d601333730bd200baa9514e880e4c5277b1241a67e267b602b400ded'
+            '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
+
+	# 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 gnome-keyring
+	patch -Np1 < "${srcdir}"/0009-mysql-workbench-gnome-keyring.patch
+
+	# fix cannot call member function without object
+	patch -Np1 < "${srcdir}"/0010-mysql-workbench-object.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
+
+	# icons
+	for SIZE in 16 24 32 48 64 96 128; do
+		convert -scale ${SIZE} \
+			images/icons/linux/128x128/apps/mysql-workbench.png \
+			${srcdir}/mysql-workbench.png
+		install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+	done
+
+	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-staging-x86_64/arch_linux_profile.xml (from rev 133140, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)

Copied: mysql-workbench/repos/community-staging-x86_64/mysql-workbench.install (from rev 133140, mysql-workbench/trunk/mysql-workbench.install)
===================================================================
--- community-staging-x86_64/mysql-workbench.install	                        (rev 0)
+++ community-staging-x86_64/mysql-workbench.install	2015-05-09 19:45:04 UTC (rev 133141)
@@ -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
+}
+

More information about the arch-commits mailing list