development/mysql-workbench: Update GDAL to 3.11.1.

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

4 files changed, 26 insertions, 5 deletions

diff --git a/development/mysql-workbench/0005-gcc-15.patch b/development/mysql-workbench/0005-gcc-15.patch
new file mode 100644
index 0000000000..1ada825ad9
--- /dev/null
+++ b/development/mysql-workbench/0005-gcc-15.patch
@@ -0,0 +1,11 @@
+diff -ru mysql-connector-c++-9.3.0-src.orig/include/mysqlx/common/value.h mysql-connector-c++-9.3.0-src/include/mysqlx/common/value.h
+--- mysql-connector-c++-9.3.0-src.orig/include/mysqlx/common/value.h	2025-05-18 12:30:03.916477018 +0200
++++ mysql-connector-c++-9.3.0-src/include/mysqlx/common/value.h	2025-05-18 12:30:25.042409140 +0200
+@@ -35,6 +35,7 @@
+ #include "api.h"
+ #include "error.h"
+ #include "util.h"
++#include <cstdint>
+ 
+ PUSH_SYS_WARNINGS
+ #include <string>
diff --git a/development/mysql-workbench/README b/development/mysql-workbench/README
index 675f68f45d..f9b79a2e95 100644
--- a/development/mysql-workbench/README
+++ b/development/mysql-workbench/README
@@ -11,9 +11,13 @@ environment for:
 * Database Administration (replacing MySQL Administrator)
 
 You need to allow MySQL to accept incoming connections from outside:
+For Slackware 15.0, this option is in /etc/rc.d/rc.mysqld.
 Remove or comment this line:  SKIP="--skip-networking"  and then do:
 /etc/rc.d/rc.mysqld restart
 
+NOTE: For current, this option is moved to /etc/default/mariadb
+Remove --skip-networking from MARIADB_OPTIONS line
+
 Note: MySQL Workbench will be built against Python 2.7 even when
 Python 3.x is installed on your system
 
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 3e57854758..65056bc4dd 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -35,8 +35,8 @@ VERSION_BOOST_SRC=`echo $VERSION_BOOST | tr . _`
 PRGNAM4=mysql-connector-c++
 VERSION_MYSQL_CONNECTOR=9.3.0
 PRGNAM5=gdal
-VERSION_GDAL=3.10.3
-BUILD=${BUILD:-1}
+VERSION_GDAL=3.11.1
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -132,6 +132,9 @@ sed -i \
 		-e '/cmake_minimum_required/Is|[23]\.[.0-9]\+|3.12|' \
 		$(find "$TMP/$PRGNAM4-${VERSION_MYSQL_CONNECTOR}-src"/ -name 'CMakeLists.txt')
 
+# Fix for GCC 15
+patch -p1 < $CWD/0005-gcc-15.patch
+
 mkdir -p build
 cd build
 cmake \
@@ -241,7 +244,7 @@ cmake \
   -DGDAL_LIBRARY="$TMP/install-bundle/usr/lib${LIBDIRSUFFIX}/libgdal.so" \
   -DWITH_ANTLR_JAR="$TMP/install-bundle/antlr-4.13.0-complete.jar" \
   -DUNIXODBC_CONFIG_PATH="/usr/bin/odbc_config" \
-  -DUNIXODBC_INCLUDE_DIRS="/usr/include" \
+  -DUNIXODBC_INCLUDE_DIRS="/usr/include/unixodbc" \
   -DUSE_BUNDLED_MYSQLDUMP=1 \
    ..
 
@@ -276,6 +279,9 @@ done
 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
 
+# Fix ldconfig path
+sed -i "s|ldconfig|/sbin/ldconfig|" $PKG/usr/bin/mysql-workbench
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv AUTHORS *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index 4e3300d5c7..c853cb02e2 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -7,13 +7,13 @@ DOWNLOAD_x86_64="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-
           https://cdn.mysql.com//Downloads/MySQL-8.4/mysql-8.4.5.tar.gz \
           https://sourceforge.net/projects/boost/files/boost/1.87.0/boost_1_87_0.tar.bz2 \
           https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-9.3.0-src.tar.gz \
-          https://download.osgeo.org/gdal/3.10.3/gdal-3.10.3.tar.xz \
+          https://download.osgeo.org/gdal/3.11.1/gdal-3.11.1.tar.xz \
           https://www.antlr.org/download/antlr-4.13.2-complete.jar"
 MD5SUM_x86_64="f8b148203ee458b5135432790a66e6e5 \
         e0354d766a90a43f65f9b894bf9a1e55 \
         ccdfe37d3bad682d841782f760faf141 \
         48ace87e8d2266ff5cba391d0ef2ceb5 \
-        5d21ced635917281bfbeb9f4b458917b \
+        687821829a2312e670ba3936152aa9a7 \
         3c8bf23796901bbadaccf6e4c1f923e7"
 REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ jdk19 unixODBC rapidjson"
 MAINTAINER="Willy Sudiarto Raharjo"