development/mysql-workbench: Updated for version 8.0.33.

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

2 files changed, 23 insertions, 50 deletions

diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 4d44eb4f98..8ac360ab85 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.32}
-VERSION_MYSQL=8.0.32
+VERSION=${VERSION:-8.0.33}
+VERSION_MYSQL=8.0.33
 PRGNAM3=boost
 VERSION_BOOST=1_77_0
 PRGNAM4=mysql-connector-c++
-VERSION_MYSQL_CONNECTOR=8.0.32
+VERSION_MYSQL_CONNECTOR=8.0.33
 PRGNAM5=gdal
-VERSION_GDAL=3.6.2
+VERSION_GDAL=3.6.3
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -169,31 +169,7 @@ cd build
 
 make LD_LIBRARY_PATH="$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/"
 make LD_LIBRARY_PATH="$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/" DESTDIR="$TMP/install-bundle/" install
-ln -s ./ $TMP/install-bundle/usr/include/gdal
-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 ../
+cd ../../
 
 # Building mysql-workbench
 rm -rf $PRGNAM-community-$SRCVERSION
@@ -229,15 +205,15 @@ patch -p1 < $CWD/boost-1.73.0.patch
 patch -Np1 < $CWD/0003-include-list.patch
 
 # Install antlr Java JAR
-cp $CWD/antlr-4.9.3-complete.jar $TMP/install-bundle/antlr-4.9.3-complete.jar
+cp $CWD/antlr-4.11.1-complete.jar $TMP/install-bundle/antlr-4.11.1-complete.jar
 
-sed -i 's|4.9.1|4.9.3|' CMakeLists.txt
+sed -i 's|4.9.1|4.11.1|' CMakeLists.txt
 
 mkdir -p wb-build
 cd wb-build
 cmake \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -D_GLIBCXX_USE_CXX11_ABI=1" \
   -Wno-dev \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
   -DCMAKE_CXX_FLAGS="-std=c++17" \
@@ -248,9 +224,9 @@ cmake \
   -DMySQLCppConn_INCLUDE_DIR="$TMP/install-bundle/usr/include/jdbc" \
   -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" \
+  -DWITH_ANTLR_JAR="$TMP/install-bundle/antlr-4.11.1-complete.jar" \
+  -DUNIXODBC_CONFIG_PATH="/usr/bin/odbc_config" \
+  -DUNIXODBC_INCLUDE_DIRS="/usr/include" \
   -DUSE_BUNDLED_MYSQLDUMP=1 \
    ..
 
@@ -282,7 +258,6 @@ 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 cef7532943..3bf8728404 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,22 +1,20 @@
 PRGNAM="mysql-workbench"
-VERSION="8.0.32"
+VERSION="8.0.33"
 HOMEPAGE="https://www.mysql.com/downloads/workbench/"
-DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.32-src.tar.gz \
-          https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.32.tar.gz \
+DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.33-src.tar.gz \
+          https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.33.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.32-src.tar.gz \
-          https://download.osgeo.org/gdal/3.6.2/gdal-3.6.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="efe2b346fc5ca148b903a4cbaf3283ad \
-        0514a811eb2170b526b39c539f791bf1 \
+          https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.0.33-src.tar.gz \
+          https://download.osgeo.org/gdal/3.6.3/gdal-3.6.3.tar.xz \
+          https://www.antlr.org/download/antlr-4.11.1-complete.jar"
+MD5SUM="c9e12cdebd9c1d85687aba1f9240543d \
+        4f4d714a06f76aacb2681c2ea80531c4 \
         09dc857466718f27237144c6f2432d86 \
-        82ccb21b227932873d5b9bc3a1f676c3 \
-        6f22ffdbd8e00059ddb2b825c5920c4c \
-        67bfa5d762f069519a02dccb919676d3 \
-        eafa4fef583e12e963062882773461be"
+        0a9f912470f1a1d79bc8b1fc194c6d80 \
+        a6ccbcd5c90bf18dc1bf9b726583c505 \
+        3a8e221b166f90d13d70f5dd97941353"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ctemplate proj python2-paramiko vsqlite++ zulu-openjdk8 unixODBC rapidjson"
+REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ jdk19 unixODBC rapidjson"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"