development/mysql-workbench: Updated for version 8.0.24.

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

4 files changed, 20 insertions, 36 deletions

diff --git a/development/mysql-workbench/find-libssh.patch b/development/mysql-workbench/find-libssh.patch
deleted file mode 100644
index 4ccec88c07..0000000000
--- a/development/mysql-workbench/find-libssh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/cmake/Modules/FindLibSSH.cmake b/build/cmake/Modules/FindLibSSH.cmake
-index 3d31ed3..acbe292 100644
---- a/build/cmake/Modules/FindLibSSH.cmake
-+++ b/build/cmake/Modules/FindLibSSH.cmake
-@@ -51,7 +51,7 @@ else()
-   find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
- endif()
- 
--set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
-+set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
- file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
- if (LibSSH_VERSION_LINE_MAJOR)
-   file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define LIBSSH_VERSION_MINOR[ ]+[0-9]+")
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 326b09ca61..183a66bfda 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -25,14 +25,14 @@
 
 PRGNAM=mysql-workbench
 PRGNAM2=mysql
-VERSION=${VERSION:-8.0.23}
-VERSION_MYSQL=8.0.23
+VERSION=${VERSION:-8.0.24}
+VERSION_MYSQL=8.0.24
 PRGNAM3=boost
 VERSION_BOOST=1_73_0
 PRGNAM4=mysql-connector-c++
-VERSION_MYSQL_CONNECTOR=8.0.23
+VERSION_MYSQL_CONNECTOR=8.0.24
 PRGNAM5=gdal
-VERSION_GDAL=3.1.2
+VERSION_GDAL=3.2.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -195,16 +195,13 @@ sed -i '/^set/s|-Wall|-Wall -Wno-stringop-truncation|' CMakeLists.txt
 # make sure to link against bundled libraries
 sed -i "/target_link_libraries/s|\\$|-L$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/ \\$|" backend/wbpublic/CMakeLists.txt
 
-# Fix libssh path
-patch -p1 < $CWD/find-libssh.patch
-
 # Fix boost 1.73
 patch -p1 < $CWD/boost-1.73.0.patch
 
 # Install antlr Java JAR
-cp $CWD/antlr-4.8-complete.jar $TMP/install-bundle/antlr-4.8-complete.jar # https://www.antlr.org/download/antlr-4.8-complete.jar
+cp $CWD/antlr-4.9.2-complete.jar $TMP/install-bundle/antlr-4.9.2-complete.jar
 
-sed -i 's|4.7.1|4.8|' CMakeLists.txt
+sed -i 's|4.9.1|4.9.2|' CMakeLists.txt
 
 mkdir -p wb-build
 cd wb-build
@@ -213,7 +210,7 @@ cmake \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -Wno-dev \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-  -DCMAKE_CXX_FLAGS="-std=c++14" \
+  -DCMAKE_CXX_FLAGS="-std=c++17" \
   -DCMAKE_BUILD_TYPE=Release \
   -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
   -DMySQL_CONFIG_PATH="$TMP/install-bundle/usr/bin/mysql_config" \
@@ -221,7 +218,7 @@ 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.8-complete.jar" \
+  -DWITH_ANTLR_JAR="$TMP/install-bundle/antlr-4.9.2-complete.jar" \
   -DUSE_BUNDLED_MYSQLDUMP=1 \
    ..
 
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index 8f1e1f3070..6ff42f994f 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,18 +1,18 @@
 PRGNAM="mysql-workbench"
-VERSION="8.0.23"
+VERSION="8.0.24"
 HOMEPAGE="https://www.mysql.com/downloads/workbench/"
-DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.23-src.tar.gz \
-          https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.23.tar.gz \
+DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.24-src.tar.gz \
+          https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.24.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.23-src.tar.gz \
-          https://download.osgeo.org/gdal/3.1.2/gdal-3.1.2.tar.xz \
-          https://www.antlr.org/download/antlr-4.8-complete.jar"
-MD5SUM="7731dbe76415a5b47bdd9553c69c4581 \
-        77f03606ed9d25d00986b9bc49069a7e \
+          https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.0.24-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.2-complete.jar"
+MD5SUM="bb2bd2488bed13a6372ef64f823d270e \
+        93f9a015ff05c0fe720f3abee243bfc8 \
         9273c8c4576423562bbe84574b07b2bd \
-        99e01ed5f3cef6a498a66613b585daec \
-        4273eda69b2976a87464b95d1b41273c \
-        2016a2a6a10f0dd18eaef8b15c9df779"
+        8c4c1714f2698af91bfab354bde53b2c \
+        c656be582f7beb528c66486cd1fca7a2 \
+        9ce7f39d655a723d2a98393765ef0c31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="antlr4 ctemplate proj paramiko vsqlite++ jdk unixODBC rapidjson"
diff --git a/development/mysql-workbench/slackware_linux_profile.xml b/development/mysql-workbench/slackware_linux_profile.xml
index 9dd5dbef07..a3556bf945 100644
--- a/development/mysql-workbench/slackware_linux_profile.xml
+++ b/development/mysql-workbench/slackware_linux_profile.xml
@@ -11,6 +11,6 @@
     <value type="int" key="sys.usesudo">0</value>
 
     <value type="string" key="sys.system">Linux</value>
-    <value type="string" key="serverVersion">10.1</value>
+    <value type="string" key="serverVersion">10.5</value>
   </value>
 </data>