From 7de236f54fbc341d26f28445f03440b8de74a836 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 17 Nov 2017 23:37:18 +0000 Subject: [PATCH] community/mysql-workbench to 6.3.10-1 --- .../0004-fix-build-for-i686.patch | 140 ------------------ community/mysql-workbench/PKGBUILD | 23 ++- 2 files changed, 9 insertions(+), 154 deletions(-) delete mode 100644 community/mysql-workbench/0004-fix-build-for-i686.patch diff --git a/community/mysql-workbench/0004-fix-build-for-i686.patch b/community/mysql-workbench/0004-fix-build-for-i686.patch deleted file mode 100644 index cf4364f4e..000000000 --- a/community/mysql-workbench/0004-fix-build-for-i686.patch +++ /dev/null @@ -1,140 +0,0 @@ -From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Tue, 7 Feb 2017 23:10:23 +0100 -Subject: [PATCH 1/1] fix build for i686 - -Signed-off-by: Christian Hesse ---- - library/base/jsonparser.cpp | 6 ++++-- - library/forms/jsonview.cpp | 12 ++++++++++++ - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/library/base/jsonparser.cpp b/library/base/jsonparser.cpp -index 6ed4b3f..fb4e055 100644 ---- a/library/base/jsonparser.cpp -+++ b/library/base/jsonparser.cpp -@@ -343,7 +343,7 @@ namespace JsonParser { - */ - JsonValue &JsonArray::at(SizeType pos) { - if (pos > _data.size()) -- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos)); -+ throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos)); - return _data.at(pos); - } - -@@ -358,7 +358,7 @@ namespace JsonParser { - */ - const JsonValue &JsonArray::at(SizeType pos) const { - if (pos > _data.size()) -- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos)); -+ throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos)); - return _data.at(pos); - } - -@@ -1668,12 +1668,14 @@ namespace JsonParser { - case VDouble: - _output += std::to_string((double)value); - break; -+#ifdef DEFINE_UINT64_T_FUNCTIONS - case VInt64: - _output += std::to_string((int64_t)value); - break; - case VUint64: - _output += std::to_string((uint64_t)value); - break; -+#endif - 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/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 11c283065..b88cf42a7 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -12,14 +12,14 @@ highmem=1 buildarch=28 pkgname=mysql-workbench -pkgver=6.3.9 -pkgrel=6 -_mysql_version=5.7.19 +pkgver=6.3.10 +pkgrel=1 +_mysql_version=5.7.20 _connector_version=1.1.9 _gdal_version=2.2.2 _boost_version=1.59.0 pkgdesc='A cross-platform, visual database design tool developed by MySQL' -arch=('i686' 'x86_64') +arch=('x86_64') url='https://www.mysql.com/products/workbench/' license=('GPL2') depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm3' @@ -29,9 +29,6 @@ depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm3' optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager' 'python2-pyodbc: database migration') makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick') -# this breaks at runtime with our default build flags -# TODO: remove in future -options=('!buildflags') validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc} "https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc} @@ -42,13 +39,12 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community '0001-mysql-workbench-no-check-for-updates.patch' '0002-disable-unsupported-operating-system-warning.patch' '0003-add-option-to-hide-nonstandard-server-warning.patch' - '0004-fix-build-for-i686.patch' '0005-gdal-use-CPLFree.patch' '0006-mysql-include-my_dir.patch' 'arch_linux_profile.xml') -sha256sums=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951' +sha256sums=('b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3' 'SKIP' - '3e51e76f93179ca7b165a7008a6cc14d56195b3aef35d26d3ac194333d291eb1' + '5397549bb7c238f396c123db2df4cad2191b11adf8986de7fe63bff8e2786487' 'SKIP' '3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4' 'SKIP' @@ -58,7 +54,6 @@ sha256sums=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951' 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593' '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea' - '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11' '0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531' 'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436' '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af') @@ -81,9 +76,6 @@ prepare() { # add option to hide nonstandard server warning patch -Np1 < "${srcdir}"/0003-add-option-to-hide-nonstandard-server-warning.patch - # fix build for i686 - patch -Np1 < "${srcdir}"/0004-fix-build-for-i686.patch - # gdal: use CPLFree() patch -Np1 < "${srcdir}"/0005-gdal-use-CPLFree.patch @@ -144,6 +136,9 @@ build() { make make DESTDIR="${srcdir}/install-bundle/" install + # fix: Can't get 'MysqlSqlFacade' module. + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS + # Build MySQL Workbench itself with bundled libs cd "${srcdir}/mysql-workbench-community-${pkgver}-src/" cmake . \