development/mysql-workbench: Updated for version 8.0.29.

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

2 files changed, 47 insertions, 19 deletions

diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 891f4dbb59..1501e006d6 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -27,14 +27,14 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mysql-workbench
 PRGNAM2=mysql
-VERSION=${VERSION:-8.0.28}
-VERSION_MYSQL=8.0.28
+VERSION=${VERSION:-8.0.29}
+VERSION_MYSQL=8.0.29
 PRGNAM3=boost
-VERSION_BOOST=1_73_0
+VERSION_BOOST=1_77_0
 PRGNAM4=mysql-connector-c++
-VERSION_MYSQL_CONNECTOR=8.0.28
+VERSION_MYSQL_CONNECTOR=8.0.29
 PRGNAM5=gdal
-VERSION_GDAL=3.2.2
+VERSION_GDAL=3.4.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -172,6 +172,29 @@ make LD_LIBRARY_PATH="$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/" DESTDIR="$TMP
 
 cd ../
 
+# Build antlr-4.9 until it builds with 4.10
+rm -rf antlr4-build
+mkdir -p antlr4-build
+cd antlr4-build
+unzip $CWD/antlr4-cpp-runtime-4.9.3-source.zip
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cmake \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_CXX_STANDARD=17 \
+	-DANTLR4_INSTALL=ON \
+	-DINSTALL_GTEST=OFF \
+	.
+	make
+	make DESTDIR="$TMP/install-bundle/" install
+cd ../
+
 # Building mysql-workbench
 rm -rf $PRGNAM-community-$SRCVERSION
 tar xvf $CWD/$PRGNAM-community-$SRCVERSION.tar.gz
@@ -230,6 +253,8 @@ cmake \
   -DGDAL_INCLUDE_DIR="$TMP/install-bundle/usr/include" \
   -DGDAL_LIBRARY="$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/libgdal.so" \
   -DWITH_ANTLR_JAR="$TMP/install-bundle/antlr-4.9.3-complete.jar" \
+  -DANTLR4_INCLUDE_DIR="$TMP/install-bundle/usr/include" \
+  -DANTLR4_LIBRARY="$TMP/install-bundle/usr/lib/libantlr4-runtime.so.4.9.3" \
   -DUSE_BUNDLED_MYSQLDUMP=1 \
    ..
 
@@ -261,6 +286,7 @@ for LIBRARY in $(find "$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/" -type f -reg
   ln -s "${BASENAME}" "$PKG"/usr/lib${LIBDIRSUFFIX}/mysql-workbench/"${SONAME}"
 done
 
+install -D -m0755 $TMP/install-bundle/usr/lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
 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 69797def99..1aa1ed8006 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,20 +1,22 @@
 PRGNAM="mysql-workbench"
-VERSION="8.0.28"
+VERSION="8.0.29"
 HOMEPAGE="https://www.mysql.com/downloads/workbench/"
-DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.28-src.tar.gz \
-          https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.28.tar.gz \
-          https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.bz2 \
-          https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.0.28-src.tar.gz \
-          https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz \
-          https://www.antlr.org/download/antlr-4.9.3-complete.jar"
-MD5SUM="7ab04fd8a529b56eb79c3f981b244bd5 \
-        4f379c05ed9ab5b64bca07cc39e5289a \
-        9273c8c4576423562bbe84574b07b2bd \
-        4f4192dfaffc76e792e425be81986482 \
-        c656be582f7beb528c66486cd1fca7a2 \
-        67bfa5d762f069519a02dccb919676d3"
+DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.29-src.tar.gz \
+          https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.29.tar.gz \
+          https://sourceforge.net/projects/boost/files/boost/1.77.0/boost_1_77_0.tar.bz2 \
+          https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.0.29-src.tar.gz \
+          https://download.osgeo.org/gdal/3.4.2/gdal-3.4.2.tar.xz \
+          https://www.antlr.org/download/antlr-4.9.3-complete.jar \
+          https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip"
+MD5SUM="ec6e9e789e01a0b9b1cb0f9bfc1145e0 \
+        f9552e8a7372db589a406aef590bdb80 \
+        09dc857466718f27237144c6f2432d86 \
+        bae8667e3afce94774122459037d3f8b \
+        4b6ac60068a60059a31e125b2a169d86 \
+        67bfa5d762f069519a02dccb919676d3 \
+        eafa4fef583e12e963062882773461be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ zulu-openjdk8 unixODBC rapidjson"
+REQUIRES="ctemplate proj python2-paramiko vsqlite++ zulu-openjdk8 unixODBC rapidjson"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"