development/mysql-workbench: Updated for version 6.2.4.

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

4 files changed, 53 insertions, 5 deletions

diff --git a/development/mysql-workbench/mysql-workbench-paramiko.patch b/development/mysql-workbench/mysql-workbench-paramiko.patch
new file mode 100644
index 000000000000..4c8196dd79b7
--- /dev/null
+++ b/development/mysql-workbench/mysql-workbench-paramiko.patch
@@ -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)
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 38d154d38970..901adb66d0df 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mysql-workbench
-VERSION=${VERSION:-6.2.3}
+VERSION=${VERSION:-6.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,6 +82,11 @@ patch -p1 < $CWD/config_and_ifconfig_paths.patch
 # Patch to fix gdal include path
 patch -p1 < $CWD/workbench-gdal.patch
 
+# Patch SSH Tunnel
+patch -p1 < $CWD/mysql-workbench-paramiko.patch
+
+install -D $CWD/antlr-3.4-complete.jar $TMP/linux-res/bin/antlr-3.4-complete.jar
+
 mkdir wb-build
 cd wb-build
 cmake \
@@ -102,6 +107,9 @@ touch $TMP/$PRGNAM-community-$SRCVERSION/LICENSE.mysql
 
 make install DESTDIR=$PKG
 
+# Add Slackware Linux
+install -m0644 $CWD/slackware_linux_profile.xml $PKG/usr/share/mysql-workbench/mysql.profiles/Slackware_Linux_14.1_\(MariaDB_5.5_Package\).xml
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index b9fe0aec5be8..956dc2800aa9 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,10 +1,12 @@
 PRGNAM="mysql-workbench"
-VERSION="6.2.3"
+VERSION="6.2.4"
 HOMEPAGE="https://www.mysql.com/downloads/workbench/"
-DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.2.3-src.tar.gz"
-MD5SUM="d58ac1beeb3bdaaba65b48e2a24df79b"
+DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.2.4-src.tar.gz \
+          http://www.antlr3.org/download/antlr-3.4-complete.jar"
+MD5SUM="d18223d9e8e43a4cfc508eb18beaf662 \
+        1b91dea1c7d480b3223f7c8a9aa0e172"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="tinyxml ecdsa mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython gdal"
+REQUIRES="tinyxml ecdsa mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython gdal libantlr3c jdk"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/development/mysql-workbench/slackware_linux_profile.xml b/development/mysql-workbench/slackware_linux_profile.xml
new file mode 100644
index 000000000000..dfb4b25fdcc9
--- /dev/null
+++ b/development/mysql-workbench/slackware_linux_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<data>
+    <value type="dict">
+    <value type="string" key="sys.config.path">/etc/my.cnf</value>
+    <value type="string" key="sys.config.section">mysqld</value>
+
+    <value type="string" key="sys.mysqld.start">/etc/rc.d/rc.mysqld start</value>
+    <value type="string" key="sys.mysqld.stop">/etc/rc.d/rc.mysqld stop</value>
+    <value type="string" key="sys.mysqld.status">ps -C mysqld -o pid=</value>
+    <value type="int" key="sys.usesudo">0</value>
+
+    <value type="string" key="sys.system">Linux</value>
+    <value type="string" key="serverVersion">5.5.40</value>
+  </value>
+</data>