From 5295fb876e1c0f34ad1bbf90693bd8c968b60246 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sun, 26 Nov 2017 18:08:54 +0700 Subject: development/mysql-workbench: Updated for version 6.3.10. Signed-off-by: Willy Sudiarto Raharjo --- .../mysql-workbench/fix-build-for-i686.patch | 89 ---------------------- .../mysql-workbench/mysql-workbench.SlackBuild | 4 +- development/mysql-workbench/mysql-workbench.info | 6 +- 3 files changed, 5 insertions(+), 94 deletions(-) diff --git a/development/mysql-workbench/fix-build-for-i686.patch b/development/mysql-workbench/fix-build-for-i686.patch index cf4364f4e5..e25411cbc5 100644 --- a/development/mysql-workbench/fix-build-for-i686.patch +++ b/development/mysql-workbench/fix-build-for-i686.patch @@ -46,95 +46,6 @@ index 6ed4b3f..fb4e055 100644 case VObject: write((JsonObject)value); break; -diff --git a/library/forms/jsonview.cpp b/library/forms/jsonview.cpp -index 1259427..2d50491 100644 ---- a/library/forms/jsonview.cpp -+++ b/library/forms/jsonview.cpp -@@ -651,8 +651,10 @@ void JsonTreeBaseView::setCellValue(mforms::TreeNodeRef node, int column, const - if (data != nullptr) { - std::stringstream buffer; - double number = 0; -+#ifdef DEFINE_UINT64_T_FUNCTIONS - int64_t number2 = 0; - uint64_t number3 = 0; -+#endif - bool retBool = false; - auto &storedValue = data->getData(); - switch (storedValue.getType()) { -@@ -664,6 +666,7 @@ void JsonTreeBaseView::setCellValue(mforms::TreeNodeRef node, int column, const - storedValue = number; - setData = true; - break; -+#ifdef DEFINE_UINT64_T_FUNCTIONS - case VInt64: - if (!base::is_number(value)) - break; -@@ -680,6 +683,7 @@ void JsonTreeBaseView::setCellValue(mforms::TreeNodeRef node, int column, const - storedValue = number3; - setData = true; - break; -+#endif - case VBoolean: - if (!base::isBool(value)) - break; -@@ -1073,6 +1077,7 @@ void JsonTreeView::generateNumberInTree(JsonParser::JsonValue &value, int /*colu - node->set_string(1, std::to_string((double)value)); - node->set_string(2, "Double"); - break; -+#ifdef DEFINE_UINT64_T_FUNCTIONS - case VInt64: - node->set_string(1, std::to_string((int64_t)value)); - node->set_string(2, "Long Integer"); -@@ -1081,6 +1086,7 @@ void JsonTreeView::generateNumberInTree(JsonParser::JsonValue &value, int /*colu - node->set_string(1, std::to_string((uint64_t)value)); - node->set_string(2, "Unsigned Long Integer"); - break; -+#endif - default: - break; - } -@@ -1322,8 +1328,10 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef node, int column, const std: - if (data != NULL) { - std::stringstream buffer; - double number = 0; -+#ifdef DEFINE_UINT64_T_FUNCTIONS - int64_t number2 = 0; - uint64_t number3 = 0; -+#endif - bool retBool = false; - switch (storedValue.getType()) { - case VDouble: -@@ -1334,6 +1342,7 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef node, int column, const std: - storedValue = number; - node->set_float(column, number); - _dataChanged(false); -+#ifdef DEFINE_UINT64_T_FUNCTIONS - case VInt64: - if (!base::is_number(value)) - break; -@@ -1352,6 +1361,7 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef node, int column, const std: - node->set_float(column, (double)number3); - _dataChanged(false); - break; -+#endif - case VBoolean: - if (!base::isBool(value)) - break; -@@ -1611,12 +1621,14 @@ void JsonGridView::generateNumberInTree(JsonParser::JsonValue &value, int column - case VDouble: - node->set_float(columnId, (double)value); - break; -+#ifdef DEFINE_UINT64_T_FUNCTIONS - case VInt64: - node->set_long(columnId, (int64_t)value); - break; - case VUint64: - node->set_long(columnId, (uint64_t)value); - break; -+#endif - default: - break; - } -- 2.11.1 diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild index 9f2fe32c2a..b2344f4ef3 100644 --- a/development/mysql-workbench/mysql-workbench.SlackBuild +++ b/development/mysql-workbench/mysql-workbench.SlackBuild @@ -25,9 +25,9 @@ PRGNAM=mysql-workbench PRGNAM2=antlr -VERSION=${VERSION:-6.3.9} +VERSION=${VERSION:-6.3.10} ANTLRVER=3.4 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCVERSION=$VERSION-src diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info index 65aaec26d1..667f8bd5ea 100644 --- a/development/mysql-workbench/mysql-workbench.info +++ b/development/mysql-workbench/mysql-workbench.info @@ -1,9 +1,9 @@ PRGNAM="mysql-workbench" -VERSION="6.3.9" +VERSION="6.3.10" HOMEPAGE="https://www.mysql.com/downloads/workbench/" -DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.3.9-src.tar.gz \ +DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.3.10-src.tar.gz \ http://www.antlr3.org/download/antlr-3.4-complete.jar" -MD5SUM="4a90ee9aa2d64a7e49cd4046beb7b956 \ +MD5SUM="565e52097c58a663d3498bb740eaefe5 \ 1b91dea1c7d480b3223f7c8a9aa0e172" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -- cgit v1.2.3