summaryrefslogtreecommitdiffstats
path: root/development
diff options
context:
space:
mode:
author Willy Sudiarto Raharjo2022-04-21 19:54:57 +0200
committer Willy Sudiarto Raharjo2022-04-23 20:47:20 +0200
commitb6e849d013e72834d3158a20e7b82a0aa4a9a1d3 (patch)
tree42b8f8ac91f539d237c41c98edc9f4d7be92d838 /development
parent649f1f03748914fd7553f3292863c9652807a3bf (diff)
downloadslackbuilds-b6e849d013e72834d3158a20e7b82a0aa4a9a1d3.tar.gz
development/mysql-workbench: Add upstream patch.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/mysql-workbench/0003-include-list.patch12
-rw-r--r--development/mysql-workbench/mysql-workbench.SlackBuild8
-rw-r--r--development/mysql-workbench/mysql-workbench.info4
3 files changed, 19 insertions, 5 deletions
diff --git a/development/mysql-workbench/0003-include-list.patch b/development/mysql-workbench/0003-include-list.patch
new file mode 100644
index 0000000000..7bd7b762c1
--- /dev/null
+++ b/development/mysql-workbench/0003-include-list.patch
@@ -0,0 +1,12 @@
+diff --git a/library/parsers/mysql/MySQLBaseLexer.h b/library/parsers/mysql/MySQLBaseLexer.h
+index 1a8b9ac..8bd3d57 100644
+--- a/library/parsers/mysql/MySQLBaseLexer.h
++++ b/library/parsers/mysql/MySQLBaseLexer.h
+@@ -26,6 +26,7 @@
+ #include "Lexer.h"
+ #include "MySQLRecognizerCommon.h"
+ #include "mysql-recognition-types.h"
++#include <list>
+
+ namespace antlr4 {
+ class PARSERS_PUBLIC_TYPE Lexer;
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 9bcc8899e4..891f4dbb59 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -207,10 +207,12 @@ sed -i "/target_link_libraries/s|\\$|-L$TMP/install-bundle/usr/lib${LIBDIRSUFFIX
# Fix boost 1.73
patch -p1 < $CWD/boost-1.73.0.patch
+patch -Np1 < $CWD/0003-include-list.patch
+
# Install antlr Java JAR
-cp $CWD/antlr-4.9.2-complete.jar $TMP/install-bundle/antlr-4.9.2-complete.jar
+cp $CWD/antlr-4.9.3-complete.jar $TMP/install-bundle/antlr-4.9.3-complete.jar
-sed -i 's|4.9.1|4.9.2|' CMakeLists.txt
+sed -i 's|4.9.1|4.9.3|' CMakeLists.txt
mkdir -p wb-build
cd wb-build
@@ -227,7 +229,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.9.2-complete.jar" \
+ -DWITH_ANTLR_JAR="$TMP/install-bundle/antlr-4.9.3-complete.jar" \
-DUSE_BUNDLED_MYSQLDUMP=1 \
..
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
index 3aadeba62e..69797def99 100644
--- a/development/mysql-workbench/mysql-workbench.info
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -6,13 +6,13 @@ DOWNLOAD="https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-communi
https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.bz2 \
https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.0.28-src.tar.gz \
https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz \
- https://www.antlr.org/download/antlr-4.9.2-complete.jar"
+ https://www.antlr.org/download/antlr-4.9.3-complete.jar"
MD5SUM="7ab04fd8a529b56eb79c3f981b244bd5 \
4f379c05ed9ab5b64bca07cc39e5289a \
9273c8c4576423562bbe84574b07b2bd \
4f4192dfaffc76e792e425be81986482 \
c656be582f7beb528c66486cd1fca7a2 \
- 9ce7f39d655a723d2a98393765ef0c31"
+ 67bfa5d762f069519a02dccb919676d3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="antlr4 ctemplate proj python2-paramiko vsqlite++ zulu-openjdk8 unixODBC rapidjson"