development/mysql-workbench: Updated for version 6.2.5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 105 insertions, 12 deletions

diff --git a/development/mysql-workbench/mysql-workbench-column-label.patch b/development/mysql-workbench/mysql-workbench-column-label.patch
new file mode 100644
index 0000000000..ee6d3cd0b7
--- /dev/null
+++ b/development/mysql-workbench/mysql-workbench-column-label.patch
@@ -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
+ }
+ 
+ 
diff --git a/development/mysql-workbench/mysql-workbench-gnome-keyring.patch b/development/mysql-workbench/mysql-workbench-gnome-keyring.patch
new file mode 100644
index 0000000000..006cfec504
--- /dev/null
+++ b/development/mysql-workbench/mysql-workbench-gnome-keyring.patch
@@ -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
+ 
diff --git a/development/mysql-workbench/mysql-workbench-no-set-gtid-purged.patch b/development/mysql-workbench/mysql-workbench-no-set-gtid-purged.patch
new file mode 100644
index 0000000000..69242c507b
--- /dev/null
+++ b/development/mysql-workbench/mysql-workbench-no-set-gtid-purged.patch
@@ -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)]
+     }
+ 
+     }
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 7ec174ddd6..e2bf29b2d7 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mysql-workbench
-VERSION=${VERSION:-6.2.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-6.2.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCVERSION=$VERSION-src
@@ -75,21 +75,24 @@ find -L . \
 # Patch from Ponce
 patch -p1 < $CWD/config_and_ifconfig_paths.patch
 
-# Patch to fix deprecated calls to tpl->ReloadIfChanged in ctemplate
-# Reserved for ctemplate 2.3 update
-# patch -p1 < $CWD/mysql-workbench-ctemplate.patch
+# fix schema and table inspector with mysql-connector-c++ >= 1.1.5
+# still not really working, so mysql-connector-c++ is kept at 1.1.3
+patch -p1 < $CWD/mysql-workbench-column-label.patch
 
 # Patch to fix gdal include path
 patch -p1 < $CWD/workbench-gdal.patch
 
-# Patch SSH Tunnel
-patch -p1 < $CWD/mysql-workbench-paramiko.patch
+# mysqldump from mariadb does not support --set-gtid-purged
+patch -p1 < $CWD/mysql-workbench-no-set-gtid-purged.patch
 
-patch -p1 < $CWD/mysql-workbench-py-append.patch
+# fix gnome-keyring
+# this is reserved for future gnome-keyring releases, but harmless for
+# gnome-keyring package in stable release as well
+patch -p1 < $CWD/mysql-workbench-gnome-keyring.patch
 
 install -D $CWD/antlr-3.4-complete.jar $TMP/linux-res/bin/antlr-3.4-complete.jar
 
-mkdir wb-build
+mkdir -p wb-build
 cd wb-build
 cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index 48ad8555f1..e16a1c7a21 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,9 +1,9 @@
 PRGNAM="mysql-workbench"
-VERSION="6.2.4"
+VERSION="6.2.5"
 HOMEPAGE="https://www.mysql.com/downloads/workbench/"
-DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.2.4-src.tar.gz \
+DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.2.5-src.tar.gz \
           http://www.antlr3.org/download/antlr-3.4-complete.jar"
-MD5SUM="d18223d9e8e43a4cfc508eb18beaf662 \
+MD5SUM="31f8bd081993854f76d0bc73df08c3ad \
         1b91dea1c7d480b3223f7c8a9aa0e172"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""