diff options
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 0001-do-not-pass-type-to-std-make_pair.patch | 30 | ||||
-rw-r--r-- | 0002-disable-unsupported-operating-system-warning.patch | 29 | ||||
-rw-r--r-- | 0003-add-option-to-hide-nonstandard-server-warning.patch | 36 | ||||
-rw-r--r-- | 0004-fix-build-for-i686.patch | 140 | ||||
-rw-r--r-- | PKGBUILD | 37 |
6 files changed, 239 insertions, 51 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jun 24 20:47:01 UTC 2016 +# Thu Feb 9 09:28:00 UTC 2017 pkgbase = mysql-workbench-git pkgdesc = A cross-platform, visual database design tool developed by MySQL - git checkout - pkgver = 6.3.7.r107.g406ec7d + pkgver = 6.3.9.r0.g1972008 pkgrel = 1 url = https://www.mysql.com/products/workbench/ arch = i686 @@ -19,7 +19,7 @@ pkgbase = mysql-workbench-git depends = ctemplate depends = desktop-file-utils depends = freetype2 - depends = gtkmm + depends = gtkmm3 depends = hicolor-icon-theme depends = libgl depends = libgnome-keyring @@ -42,20 +42,24 @@ pkgbase = mysql-workbench-git source = git://github.com/mysql/mysql-workbench.git source = git://github.com/mysql/mysql-server.git source = git://github.com/mysql/mysql-connector-cpp.git - source = http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.xz + source = http://download.osgeo.org/gdal/2.1.3/gdal-2.1.3.tar.xz source = https://downloads.sourceforge.net/project/boost/boost/1.59.0/boost_1_59_0.tar.bz2 source = http://www.antlr3.org/download/antlr-3.4-complete.jar - source = 0001-do-not-pass-type-to-std-make_pair.patch source = 0001-mysql-workbench-no-check-for-updates.patch + source = 0002-disable-unsupported-operating-system-warning.patch + source = 0003-add-option-to-hide-nonstandard-server-warning.patch + source = 0004-fix-build-for-i686.patch source = arch_linux_profile.xml sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03 + sha256sums = b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005 sha256sums = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca sha256sums = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 - sha256sums = 9088cdcf82c1a925806d9162702e19c94fa21d89d422370df3f5700e204f5b32 sha256sums = b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf + sha256sums = 0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593 + sha256sums = 3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea + sha256sums = 68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11 sha256sums = 2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af pkgname = mysql-workbench-git diff --git a/0001-do-not-pass-type-to-std-make_pair.patch b/0001-do-not-pass-type-to-std-make_pair.patch deleted file mode 100644 index 2acbcbd616ea..000000000000 --- a/0001-do-not-pass-type-to-std-make_pair.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 34ec0d65ede8392ba3e0f114d72672b3f517f964 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Tue, 10 May 2016 01:09:34 +0200 -Subject: [PATCH 1/1] do not pass type to std::make_pair() - -We not pass type template arguments to std::make_pair() -explicitly, and let the compiler deduce them on its own. -This fixes compiler error on GCC 6.1.1. - -Signed-off-by: Christian Hesse <mail@eworm.de> ---- - client/auth_utils.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/auth_utils.cc b/client/auth_utils.cc -index 21416bb..03fd71c 100644 ---- a/client/auth_utils.cc -+++ b/client/auth_utils.cc -@@ -61,7 +61,7 @@ int parse_cnf_file(istream &sin, map<string, string > *options, - getline(sin, option_value); - trim(&option_value); - if (option_name.length() > 0) -- options->insert(make_pair<string, string >(option_name, option_value)); -+ options->insert(make_pair(option_name, option_value)); - } - return ALL_OK; - } catch(...) --- -2.8.2 - diff --git a/0002-disable-unsupported-operating-system-warning.patch b/0002-disable-unsupported-operating-system-warning.patch new file mode 100644 index 000000000000..56aef14132bf --- /dev/null +++ b/0002-disable-unsupported-operating-system-warning.patch @@ -0,0 +1,29 @@ +From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Wed, 8 Feb 2017 09:12:24 +0100 +Subject: [PATCH 1/1] disable unsupported operating system warning + +Signed-off-by: Christian Hesse <mail@eworm.de> +--- + backend/wbprivate/workbench/wb_context.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp +index 82c0fa6..f06ff99 100644 +--- a/backend/wbprivate/workbench/wb_context.cpp ++++ b/backend/wbprivate/workbench/wb_context.cpp +@@ -1009,9 +1009,11 @@ void WBContext::init_finish_(WBOptions *options) { + + _frontendCallbacks->show_status_text(_("Ready.")); + ++#if 0 + if (options->open_at_startup_type != + "run-script") // <--- so that our runtime tests don't lock up when a modal warning dialog is displayed + warnIfRunningOnUnsupportedOS(); ++#endif + + try { + // execute action requested from command line +-- +2.11.1 + diff --git a/0003-add-option-to-hide-nonstandard-server-warning.patch b/0003-add-option-to-hide-nonstandard-server-warning.patch new file mode 100644 index 000000000000..31471fa9c6c9 --- /dev/null +++ b/0003-add-option-to-hide-nonstandard-server-warning.patch @@ -0,0 +1,36 @@ +From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Wed, 8 Feb 2017 09:42:29 +0100 +Subject: [PATCH 1/1] add option to hide nonstandard server warning + +Signed-off-by: Christian Hesse <mail@eworm.de> +--- + backend/wbprivate/workbench/wb_context.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp +index f06ff99..f89006b 100644 +--- a/backend/wbprivate/workbench/wb_context.cpp ++++ b/backend/wbprivate/workbench/wb_context.cpp +@@ -3038,7 +3038,7 @@ std::shared_ptr<SqlEditorForm> WBContext::add_new_query_window(const db_mgmt_Con + logError("Unsupported server version: %s %s\n", form->connection_details()["dbmsProductName"].c_str(), + form->connection_details()["dbmsProductVersion"].c_str()); + +- if (mforms::Utilities::show_warning( ++ if (mforms::Utilities::show_message_and_remember( + base::strfmt("Connection Warning (%s)", targetConnection->name().c_str()), + base::strfmt( + "Incompatible/nonstandard server version or connection protocol detected (%s).\n\n" +@@ -3046,7 +3046,8 @@ std::shared_ptr<SqlEditorForm> WBContext::add_new_query_window(const db_mgmt_Con + "properly since the database is not fully compatible with the supported versions of MySQL.\n\n" + "MySQL Workbench is developed and tested for MySQL Server versions 5.1, 5.5, 5.6 and 5.7", + bec::sanitize_server_version_number(form->connection_details()["dbmsProductVersion"]).c_str()), +- "Continue Anyway", "Cancel") != mforms::ResultOk) { ++ "Continue Anyway", "Cancel", "", "wb.supported_server_check.suppress_warning", ++ "Don't show this message again") != mforms::ResultOk) { + _frontendCallbacks->show_status_text(_("Unsupported server")); + return SqlEditorForm::Ref(); + } +-- +2.11.1 + diff --git a/0004-fix-build-for-i686.patch b/0004-fix-build-for-i686.patch new file mode 100644 index 000000000000..cf4364f4e55a --- /dev/null +++ b/0004-fix-build-for-i686.patch @@ -0,0 +1,140 @@ +From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Tue, 7 Feb 2017 23:10:23 +0100 +Subject: [PATCH 1/1] fix build for i686 + +Signed-off-by: Christian Hesse <mail@eworm.de> +--- + 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 + @@ -5,16 +5,16 @@ # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=mysql-workbench-git -pkgver=6.3.7.r107.g406ec7d +pkgver=6.3.9.r0.g1972008 pkgrel=1 # mysql & mysql-connector-c++ from git -_gdal_version=2.1.0 +_gdal_version=2.1.3 _boost_version=1.59.0 pkgdesc='A cross-platform, visual database design tool developed by MySQL - git checkout' arch=('i686' 'x86_64') url='https://www.mysql.com/products/workbench/' license=('GPL2') -depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm' +depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm3' 'hicolor-icon-theme' 'libgl' 'libgnome-keyring' 'libiodbc' 'libxml2' 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo' 'python2-paramiko' 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++') @@ -30,17 +30,21 @@ source=('git://github.com/mysql/mysql-workbench.git' "http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz" "https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2" 'http://www.antlr3.org/download/antlr-3.4-complete.jar' - '0001-do-not-pass-type-to-std-make_pair.patch' '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' 'arch_linux_profile.xml') sha256sums=('SKIP' 'SKIP' 'SKIP' - '568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03' + 'b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005' '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca' '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7' - '9088cdcf82c1a925806d9162702e19c94fa21d89d422370df3f5700e204f5b32' 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf' + '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593' + '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea' + '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11' '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af') pkgver() { @@ -59,22 +63,26 @@ pkgver() { } prepare() { - cd "${srcdir}/mysql-server/" - - patch -Np1 < "${srcdir}"/0001-do-not-pass-type-to-std-make_pair.patch - cd "${srcdir}/mysql-workbench/" # Disable 'Help' -> 'Check for Updates' # Updates are provided via Arch Linux packages patch -Np1 < "${srcdir}"/0001-mysql-workbench-no-check-for-updates.patch + # disable unsupported operating system warning + patch -Np1 < "${srcdir}"/0002-disable-unsupported-operating-system-warning.patch + + # 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 + # we need python 2.x sed -i '/^FIND_PROGRAM(PYTHON_EXEC /c FIND_PROGRAM(PYTHON_EXEC "python2")' \ CMakeLists.txt # put antlr into place - # release tarball has the files, git still needs antlr! install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar } @@ -116,7 +124,8 @@ build() { --includedir=/usr/include/gdal \ --with-sqlite3 \ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \ - --with-curl + --with-curl \ + --without-jasper make make DESTDIR="${srcdir}/install-bundle/" install @@ -127,8 +136,8 @@ build() { -DCMAKE_CXX_FLAGS="-std=c++11" \ -DCMAKE_BUILD_TYPE=Release \ -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \ - -DMYSQLCPPCONN_LIBRARY="-L${srcdir}/install-bundle/usr/lib -lmysqlcppconn" \ - -DMYSQLCPPCONN_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \ + -DMySQLCppConn_LIBRARY="${srcdir}/install-bundle/usr/lib/libmysqlcppconn.so" \ + -DMySQLCppConn_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \ -DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \ -DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \ -DUSE_BUNDLED_MYSQLDUMP=1 |