aboutsummaryrefslogtreecommitdiff
path: root/development/mysql-workbench
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-01-20 01:35:24 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-01-20 09:06:18 +0700
commit81200cc3bc5d74a1398ae3c822753c7d45578252 (patch)
treec98c7945f7295c62449bba2cf1cf16f01c875616 /development/mysql-workbench
parent2347276bb6a9fdd94490dc9de2e99d60666c85ae (diff)
development/mysql-workbench: Updated for version 8.0.36.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/mysql-workbench')
-rw-r--r--development/mysql-workbench/0004-libxml2.patch39
-rw-r--r--development/mysql-workbench/mysql-workbench.SlackBuild13
-rw-r--r--development/mysql-workbench/mysql-workbench.info18
3 files changed, 56 insertions, 14 deletions
diff --git a/development/mysql-workbench/0004-libxml2.patch b/development/mysql-workbench/0004-libxml2.patch
new file mode 100644
index 0000000000000..aa1f7aad9af03
--- /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/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index ed99b97ecc835..34a26bb7e1977 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-2023 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.34}
-VERSION_MYSQL=8.1.0
+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.1.0
+VERSION_MYSQL_CONNECTOR=8.3.0
PRGNAM5=gdal
-VERSION_GDAL=3.7.1
+VERSION_GDAL=3.8.3
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -212,6 +212,9 @@ 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 \
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index 44c9b6264ca47..30e9184250d2d 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -1,19 +1,19 @@
PRGNAM="mysql-workbench"
-VERSION="8.0.34"
+VERSION="8.0.36"
HOMEPAGE="https://www.mysql.com/downloads/workbench/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="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 \
+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.1.0-src.tar.gz \
- https://download.osgeo.org/gdal/3.7.1/gdal-3.7.1.tar.xz \
+ 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="8718de577ba7242b85388fd06eea9f4c \
- 13fe8f9f463b2f462763cd21459590a0 \
+MD5SUM_x86_64="c66df533723fa37c1dca6afd7a1b61d7 \
+ f41557d70f4ba990ac0cd6fa32c3a313 \
09dc857466718f27237144c6f2432d86 \
- b20662354fbf0c4da61cb420a3df907a \
- 9f94939c0efca2ca3eafd8cd3255a0f0 \
+ 4255b2b2582b284445c11254f34991e3 \
+ a4c8d86db4c80a46dd6ad2fee6ad632f \
c9c8b566a7fcf8ef80e229f14b154a26"
REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ jdk19 unixODBC rapidjson"
MAINTAINER="Willy Sudiarto Raharjo"