summaryrefslogtreecommitdiffstats
path: root/development/mysql-workbench
diff options
context:
space:
mode:
Diffstat (limited to 'development/mysql-workbench')
-rw-r--r--development/mysql-workbench/0004-libxml2.patch39
-rw-r--r--development/mysql-workbench/README4
-rw-r--r--development/mysql-workbench/gcc13.patch30
-rw-r--r--development/mysql-workbench/mysql-workbench.SlackBuild78
-rw-r--r--development/mysql-workbench/mysql-workbench.info30
5 files changed, 113 insertions, 68 deletions
diff --git a/development/mysql-workbench/0004-libxml2.patch b/development/mysql-workbench/0004-libxml2.patch
new file mode 100644
index 0000000000..aa1f7aad9a
--- /dev/null
+++ b/development/mysql-workbench/0004-libxml2.patch
@@ -0,0 +1,39 @@
+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/README b/development/mysql-workbench/README
index 9595b663d2..06243cfa67 100644
--- a/development/mysql-workbench/README
+++ b/development/mysql-workbench/README
@@ -20,7 +20,3 @@ Python 3.x is installed on your system
NOTE: You may need to run mysql_upgrade if mysql-workbench could not
fetch your metadata. You may need to add this into /etc/ld.so.conf:
/usr/lib{64}/mysql-workbench
-
-Warning: This SlackBuild requires network access when it runs, meaning
-it downloads files from the Internet with root access. You should
-decide for yourself whether or not you think this is a good idea.
diff --git a/development/mysql-workbench/gcc13.patch b/development/mysql-workbench/gcc13.patch
new file mode 100644
index 0000000000..ce31bf0405
--- /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 37e4807b12..34a26bb7e1 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for mysql-workbench
# Originally written by Andre Geraldo Vieira <andre.geraldo@gmail.com>
-# Copyright 2013-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,14 +27,14 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=mysql-workbench
PRGNAM2=mysql
-VERSION=${VERSION:-8.0.30}
-VERSION_MYSQL=8.0.30
+VERSION=${VERSION:-8.0.36}
+VERSION_MYSQL=8.3.0
PRGNAM3=boost
VERSION_BOOST=1_77_0
PRGNAM4=mysql-connector-c++
-VERSION_MYSQL_CONNECTOR=8.0.30
+VERSION_MYSQL_CONNECTOR=8.3.0
PRGNAM5=gdal
-VERSION_GDAL=3.5.1
+VERSION_GDAL=3.8.3
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -155,45 +155,21 @@ 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 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
-CPPFLAGS="-I/usr/include/mysql/server" \
-./configure \
- --prefix=/usr \
- --includedir=/usr/include/gdal \
- --with-sqlite3 \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --with-mysql="$TMP/install-bundle/usr/bin/mysql_config" \
- --with-curl \
- --without-jasper
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DGDAL_USE_JASPER='OFF' \
+ -DGDAL_USE_MYSQL='OFF' \
+ -DCMAKE_BUILD_TYPE=Release ..
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
-
-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,21 @@ 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.13.0-complete.jar $TMP/install-bundle/antlr-4.13.0-complete.jar
-sed -i 's|4.9.1|4.9.3|' CMakeLists.txt
+sed -i 's|4.11.1|4.13.0|' 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 \
-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 +230,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.13.0-complete.jar" \
+ -DUNIXODBC_CONFIG_PATH="/usr/bin/odbc_config" \
+ -DUNIXODBC_INCLUDE_DIRS="/usr/include" \
-DUSE_BUNDLED_MYSQLDUMP=1 \
..
@@ -282,13 +264,13 @@ 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
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 f804215d5c..30e9184250 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,22 +1,20 @@
PRGNAM="mysql-workbench"
-VERSION="8.0.30"
+VERSION="8.0.36"
HOMEPAGE="https://www.mysql.com/downloads/workbench/"
-DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-8.0.30-src.tar.gz \
- https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.30.tar.gz \
+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 \
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.30-src.tar.gz \
- https://download.osgeo.org/gdal/3.5.1/gdal-3.5.1.tar.xz \
- https://www.antlr.org/download/antlr-4.9.3-complete.jar \
- https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip"
-MD5SUM="66cd3570d23821522b7afa08bf897568 \
- cb88420e449603b82ba8ed84302922e1 \
+ 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 \
09dc857466718f27237144c6f2432d86 \
- c3e3f7c652aa4bfe9e2b77be89ebfb7e \
- 4b7981efbeed69c06c79fb65d0a60d83 \
- 67bfa5d762f069519a02dccb919676d3 \
- eafa4fef583e12e963062882773461be"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ctemplate proj python2-paramiko vsqlite++ zulu-openjdk8 unixODBC rapidjson"
+ 4255b2b2582b284445c11254f34991e3 \
+ a4c8d86db4c80a46dd6ad2fee6ad632f \
+ c9c8b566a7fcf8ef80e229f14b154a26"
+REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ jdk19 unixODBC rapidjson"
MAINTAINER="Willy Sudiarto Raharjo"
EMAIL="willysr@slackbuilds.org"
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-27 21:44:34 +0000