diff options
| -rw-r--r-- | development/mysql-workbench/gcc13.patch | 30 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.SlackBuild | 18 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.info | 22 |
3 files changed, 52 insertions, 18 deletions
diff --git a/development/mysql-workbench/gcc13.patch b/development/mysql-workbench/gcc13.patch new file mode 100644 index 0000000000000..ce31bf0405057 --- /dev/null +++ b/development/mysql-workbench/gcc13.patch @@ -0,0 +1,30 @@ +--- mysql-workbench-community-8.0.34-src/library/cdbc/src/driver_manager.h.orig 2023-07-19 21:15:37.648964114 +0700 ++++ mysql-workbench-community-8.0.34-src/library/cdbc/src/driver_manager.h 2023-07-19 21:15:45.990061252 +0700 +@@ -32,6 +32,7 @@ + + #include "grts/structs.db.mgmt.h" + #include <cppconn/connection.h> ++#include <cstdint> // for std::uint64_t + + namespace wb { + class SSHTunnel; +--- mysql-workbench-community-8.0.34-src/library/forms/mforms/treeview.h.orig 2023-07-19 21:35:04.750432184 +0700 ++++ mysql-workbench-community-8.0.34-src/library/forms/mforms/treeview.h 2023-07-19 21:35:20.883616910 +0700 +@@ -24,6 +24,7 @@ + #pragma once + + #include <mforms/view.h> ++#include <cstdint> // for std::uint64_t + + /** + * 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 8ac360ab85385..ed99b97ecc835 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.33} -VERSION_MYSQL=8.0.33 +VERSION=${VERSION:-8.0.34} +VERSION_MYSQL=8.1.0 PRGNAM3=boost VERSION_BOOST=1_77_0 PRGNAM4=mysql-connector-c++ -VERSION_MYSQL_CONNECTOR=8.0.33 +VERSION_MYSQL_CONNECTOR=8.1.0 PRGNAM5=gdal -VERSION_GDAL=3.6.3 +VERSION_GDAL=3.7.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -205,9 +205,12 @@ patch -p1 < $CWD/boost-1.73.0.patch patch -Np1 < $CWD/0003-include-list.patch # Install antlr Java JAR -cp $CWD/antlr-4.11.1-complete.jar $TMP/install-bundle/antlr-4.11.1-complete.jar +cp $CWD/antlr-4.13.0-complete.jar $TMP/install-bundle/antlr-4.13.0-complete.jar -sed -i 's|4.9.1|4.11.1|' CMakeLists.txt +sed -i 's|4.11.1|4.13.0|' CMakeLists.txt + +# patch for GCC 13.0 +patch -p1 < $CWD/gcc13.patch mkdir -p wb-build cd wb-build @@ -224,7 +227,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.11.1-complete.jar" \ + -DWITH_ANTLR_JAR="$TMP/install-bundle/antlr-4.13.0-complete.jar" \ -DUNIXODBC_CONFIG_PATH="/usr/bin/odbc_config" \ -DUNIXODBC_INCLUDE_DIRS="/usr/include" \ -DUSE_BUNDLED_MYSQLDUMP=1 \ @@ -264,6 +267,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 +rm -rf $PKG/usr/share/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info index 3bf8728404cbe..554cccd40efae 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.33" +VERSION="8.0.34" HOMEPAGE="https://www.mysql.com/downloads/workbench/" -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 \ +DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.34-src.tar.gz \ + https://cdn.mysql.com//Downloads/MySQL-8.1/mysql-8.1.0.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.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 \ + https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.1.0-src.tar.gz \ + https://download.osgeo.org/gdal/3.7.1/gdal-3.7.1.tar.xz \ + https://www.antlr.org/download/antlr-4.13.0-complete.jar" +MD5SUM="8718de577ba7242b85388fd06eea9f4c \ + 13fe8f9f463b2f462763cd21459590a0 \ 09dc857466718f27237144c6f2432d86 \ - 0a9f912470f1a1d79bc8b1fc194c6d80 \ - a6ccbcd5c90bf18dc1bf9b726583c505 \ - 3a8e221b166f90d13d70f5dd97941353" + b20662354fbf0c4da61cb420a3df907a \ + 9f94939c0efca2ca3eafd8cd3255a0f0 \ + c9c8b566a7fcf8ef80e229f14b154a26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ jdk19 unixODBC rapidjson" |