development/mysql-workbench: Updated for version 8.0.38.

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

4 files changed, 22 insertions, 74 deletions

diff --git a/development/mysql-workbench/0004-libxml2.patch b/development/mysql-workbench/0004-libxml2.patch
deleted file mode 100644
index aa1f7aad9a..0000000000
--- a/development/mysql-workbench/0004-libxml2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a9885c2feb3ec5addfd3d76928844042d014a595 Mon Sep 17 00:00:00 2001
-From: Anton Zhukharev <ancieg@altlinux.org>
-Date: Wed, 27 Dec 2023 16:15:23 +0300
-Subject: [PATCH] fix usage of libxml2
-
----
- mysql-workbench-community/library/grt/src/grt.h            | 2 +-
- mysql-workbench-community/library/grt/src/unserializer.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/library/grt/src/grt.h b/library/grt/src/grt.h
-index 47bfd637..43c1e612 100644
---- a/library/grt/src/grt.h
-+++ b/library/grt/src/grt.h
-@@ -34,7 +34,7 @@
- #include <vector>
- #include <stdexcept>
- #include <boost/function.hpp>
--#include <libxml/xmlmemory.h>
-+#include <libxml/tree.h>
- #include "base/threading.h"
- #include <string>
- #include <gmodule.h>
-diff --git a/library/grt/src/unserializer.cpp b/library/grt/src/unserializer.cpp
-index 6dda76d6..8f44c33a 100644
---- a/library/grt/src/unserializer.cpp
-+++ b/library/grt/src/unserializer.cpp
-@@ -401,7 +401,7 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si
-   xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);
- 
-   if (!doc) {
--    xmlErrorPtr error = xmlGetLastError();
-+    const xmlError *error = xmlGetLastError();
- 
-     if (error)
-       throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message));
--- 
-2.42.1
-
diff --git a/development/mysql-workbench/gcc13.patch b/development/mysql-workbench/gcc13.patch
index ce31bf0405..51dad5555b 100644
--- a/development/mysql-workbench/gcc13.patch
+++ b/development/mysql-workbench/gcc13.patch
@@ -18,13 +18,4 @@
  
  /**
   * Implementation of a control class for a treeview control based on node objects.
---- mysql-workbench-community-8.0.34-src/backend/wbpublic/sqlide/sqlide_generics_private.h.orig	2023-07-20 08:32:18.189780564 +0700
-+++ mysql-workbench-community-8.0.34-src/backend/wbpublic/sqlide/sqlide_generics_private.h	2023-07-20 08:32:48.522168445 +0700
-@@ -30,6 +30,7 @@
- #include <sqlite/query.hpp>
- #include <sqlite/execute.hpp>
- #include <ctime>
-+#include <cstdint> // for std::uint64_t
- 
- namespace sqlide {
  
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 34a26bb7e1..c88768e4f6 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.36}
-VERSION_MYSQL=8.3.0
+VERSION=${VERSION:-8.0.38}
+VERSION_MYSQL=8.4.1
 PRGNAM3=boost
 VERSION_BOOST=1_77_0
 PRGNAM4=mysql-connector-c++
-VERSION_MYSQL_CONNECTOR=8.3.0
+VERSION_MYSQL_CONNECTOR=8.4.0
 PRGNAM5=gdal
-VERSION_GDAL=3.8.3
+VERSION_GDAL=3.9.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -165,6 +165,9 @@ cd build
     -DMAN_INSTALL_DIR=/usr/man \
     -DGDAL_USE_JASPER='OFF' \
     -DGDAL_USE_MYSQL='OFF' \
+    -DBUILD_CSHARP_BINDINGS='FALSE' \
+	-DBUILD_JAVA_BINDINGS='FALSE' \
+	-DBUILD_PYTHON_BINDINGS='FALSE' \
     -DCMAKE_BUILD_TYPE=Release ..
 
 make LD_LIBRARY_PATH="$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/"
@@ -182,17 +185,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# From Archlinux: GCC 7.x complains about an unsupported flag; it also
-# introduced some new warnings, remove '-Werror' for the build to complete
-sed -i 's|-Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
 sed -i '/^\s*set/s| -Werror||' CMakeLists.txt
 
+sed -i '/target_compile_options/s|PRIVATE|PRIVATE -fno-lto|' library/sql.parser/source/CMakeLists.txt
+
 # Patch from Ponce
 patch -p1 < $CWD/config_and_ifconfig_paths.patch
 
-# GCC 7.x complains about unsupported flag
-sed -i 's|-Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
-
 # disable stringop-truncation for GCC 8.x
 sed -i '/^set/s|-Wall|-Wall -Wno-stringop-truncation|' CMakeLists.txt
 
@@ -205,16 +204,13 @@ patch -p1 < $CWD/boost-1.73.0.patch
 patch -Np1 < $CWD/0003-include-list.patch
 
 # Install antlr Java JAR
-cp $CWD/antlr-4.13.0-complete.jar $TMP/install-bundle/antlr-4.13.0-complete.jar
+cp $CWD/antlr-4.13.1-complete.jar $TMP/install-bundle/antlr-4.13.1-complete.jar
 
-sed -i 's|4.11.1|4.13.0|' CMakeLists.txt
+sed -i 's|4.11.1|4.13.1|' CMakeLists.txt
 
 # patch for GCC 13.0
 patch -p1 < $CWD/gcc13.patch
 
-# Patch for libxml2
-patch -p1 < $CWD/0004-libxml2.patch
-
 mkdir -p wb-build
 cd wb-build
 cmake \
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index 30e9184250..650d114569 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,20 +1,20 @@
 PRGNAM="mysql-workbench"
-VERSION="8.0.36"
+VERSION="8.0.38"
 HOMEPAGE="https://www.mysql.com/downloads/workbench/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.36-src.tar.gz \
-          https://cdn.mysql.com//Downloads/MySQL-8.3/mysql-8.3.0.tar.gz \
+DOWNLOAD_x86_64="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.38-src.tar.gz \
+          https://cdn.mysql.com//Downloads/MySQL-8.4/mysql-8.4.1.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.3.0-src.tar.gz \
-          https://download.osgeo.org/gdal/3.8.3/gdal-3.8.3.tar.xz \
-          https://www.antlr.org/download/antlr-4.13.0-complete.jar"
-MD5SUM_x86_64="c66df533723fa37c1dca6afd7a1b61d7 \
-        f41557d70f4ba990ac0cd6fa32c3a313 \
+          https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.4.0-src.tar.gz \
+          https://download.osgeo.org/gdal/3.9.1/gdal-3.9.1.tar.xz \
+          https://www.antlr.org/download/antlr-4.13.1-complete.jar"
+MD5SUM_x86_64="e167c80e6cce6c2dbe36d2693a342024 \
+        ea72c2dbc01224cc8e7bd362b36f387c \
         09dc857466718f27237144c6f2432d86 \
-        4255b2b2582b284445c11254f34991e3 \
-        a4c8d86db4c80a46dd6ad2fee6ad632f \
-        c9c8b566a7fcf8ef80e229f14b154a26"
+        a2804abf8aab79b15c1191a3a7176348 \
+        f0f9bad106d938cfeb751b17a1321579 \
+        78af96af276609af0bfb3f1e2bfaef89"
 REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ jdk19 unixODBC rapidjson"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"