development/mysql-workbench: Updated for version 8.0.33.

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

1 files changed, 11 insertions, 36 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