[arch-commits] Commit in mysql-workbench/repos (24 files)
Christian Hesse
eworm at archlinux.org
Mon Apr 10 20:06:05 UTC 2017
Date: Monday, April 10, 2017 @ 20:06:04
Author: eworm
Revision: 221938
archrelease: copy trunk to community-i686, community-x86_64
Added:
mysql-workbench/repos/community-i686/0001-mysql-workbench-no-check-for-updates.patch
(from rev 221937, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-i686/0002-disable-unsupported-operating-system-warning.patch
(from rev 221937, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
mysql-workbench/repos/community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch
(from rev 221937, mysql-workbench/trunk/0003-add-option-to-hide-nonstandard-server-warning.patch)
mysql-workbench/repos/community-i686/0004-fix-build-for-i686.patch
(from rev 221937, mysql-workbench/trunk/0004-fix-build-for-i686.patch)
mysql-workbench/repos/community-i686/PKGBUILD
(from rev 221937, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-i686/arch_linux_profile.xml
(from rev 221937, mysql-workbench/trunk/arch_linux_profile.xml)
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
(from rev 221937, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
mysql-workbench/repos/community-x86_64/0002-disable-unsupported-operating-system-warning.patch
(from rev 221937, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
mysql-workbench/repos/community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch
(from rev 221937, mysql-workbench/trunk/0003-add-option-to-hide-nonstandard-server-warning.patch)
mysql-workbench/repos/community-x86_64/0004-fix-build-for-i686.patch
(from rev 221937, mysql-workbench/trunk/0004-fix-build-for-i686.patch)
mysql-workbench/repos/community-x86_64/PKGBUILD
(from rev 221937, mysql-workbench/trunk/PKGBUILD)
mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
(from rev 221937, mysql-workbench/trunk/arch_linux_profile.xml)
Deleted:
mysql-workbench/repos/community-i686/0001-mysql-workbench-no-check-for-updates.patch
mysql-workbench/repos/community-i686/0002-disable-unsupported-operating-system-warning.patch
mysql-workbench/repos/community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch
mysql-workbench/repos/community-i686/0004-fix-build-for-i686.patch
mysql-workbench/repos/community-i686/PKGBUILD
mysql-workbench/repos/community-i686/arch_linux_profile.xml
mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
mysql-workbench/repos/community-x86_64/0002-disable-unsupported-operating-system-warning.patch
mysql-workbench/repos/community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch
mysql-workbench/repos/community-x86_64/0004-fix-build-for-i686.patch
mysql-workbench/repos/community-x86_64/PKGBUILD
mysql-workbench/repos/community-x86_64/arch_linux_profile.xml
---------------------------------------------------------------------------+
/0001-mysql-workbench-no-check-for-updates.patch | 42 +
/0002-disable-unsupported-operating-system-warning.patch | 58 +
/0003-add-option-to-hide-nonstandard-server-warning.patch | 72 ++
/0004-fix-build-for-i686.patch | 280 ++++++++
/PKGBUILD | 322 ++++++++++
community-i686/0001-mysql-workbench-no-check-for-updates.patch | 21
community-i686/0002-disable-unsupported-operating-system-warning.patch | 29
community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch | 36 -
community-i686/0004-fix-build-for-i686.patch | 140 ----
community-i686/PKGBUILD | 161 -----
community-x86_64/0001-mysql-workbench-no-check-for-updates.patch | 21
community-x86_64/0002-disable-unsupported-operating-system-warning.patch | 29
community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch | 36 -
community-x86_64/0004-fix-build-for-i686.patch | 140 ----
community-x86_64/PKGBUILD | 161 -----
15 files changed, 774 insertions(+), 774 deletions(-)
Deleted: community-i686/0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- community-i686/0001-mysql-workbench-no-check-for-updates.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-i686/0001-mysql-workbench-no-check-for-updates.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,21 +0,0 @@
-diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
-index a32256c..08d9a21 100644
---- a/res/wbdata/main_menu.xml
-+++ b/res/wbdata/main_menu.xml
-@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="itemType">action</value>
- </value>
-
-+ <!-- We build a package that should be updated via pacman, so disable this check.
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="name">checkUpdate</value>
- <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
- <value type="string" key="itemType">action</value>
-- </value>
-+ </value> //-->
-
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
Copied: mysql-workbench/repos/community-i686/0001-mysql-workbench-no-check-for-updates.patch (from rev 221937, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-i686/0001-mysql-workbench-no-check-for-updates.patch (rev 0)
+++ community-i686/0001-mysql-workbench-no-check-for-updates.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="itemType">action</value>
+ </value>
+
++ <!-- We build a package that should be updated via pacman, so disable this check.
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ </value>
+@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="name">checkUpdate</value>
+ <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+- </value>
++ </value> //-->
+
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
Deleted: community-i686/0002-disable-unsupported-operating-system-warning.patch
===================================================================
--- community-i686/0002-disable-unsupported-operating-system-warning.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-i686/0002-disable-unsupported-operating-system-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,29 +0,0 @@
-From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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
-
Copied: mysql-workbench/repos/community-i686/0002-disable-unsupported-operating-system-warning.patch (from rev 221937, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
===================================================================
--- community-i686/0002-disable-unsupported-operating-system-warning.patch (rev 0)
+++ community-i686/0002-disable-unsupported-operating-system-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,29 @@
+From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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 at 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
+
Deleted: community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch
===================================================================
--- community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,36 +0,0 @@
-From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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
-
Copied: mysql-workbench/repos/community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch (from rev 221937, mysql-workbench/trunk/0003-add-option-to-hide-nonstandard-server-warning.patch)
===================================================================
--- community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch (rev 0)
+++ community-i686/0003-add-option-to-hide-nonstandard-server-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,36 @@
+From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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 at 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
+
Deleted: community-i686/0004-fix-build-for-i686.patch
===================================================================
--- community-i686/0004-fix-build-for-i686.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-i686/0004-fix-build-for-i686.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,140 +0,0 @@
-From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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
-
Copied: mysql-workbench/repos/community-i686/0004-fix-build-for-i686.patch (from rev 221937, mysql-workbench/trunk/0004-fix-build-for-i686.patch)
===================================================================
--- community-i686/0004-fix-build-for-i686.patch (rev 0)
+++ community-i686/0004-fix-build-for-i686.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,140 @@
+From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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 at 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
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-i686/PKGBUILD 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,161 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Alexandre Boily <alexandreboily at gmail.com>
-# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=mysql-workbench
-pkgver=6.3.9
-pkgrel=2
-_mysql_version=5.7.17
-_connector_version=1.1.8
-_gdal_version=2.1.3
-_boost_version=1.59.0
-pkgdesc='A cross-platform, visual database design tool developed by MySQL'
-arch=('i686' 'x86_64')
-url='https://www.mysql.com/products/workbench/'
-license=('GPL2')
-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++')
-optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
- 'python2-pyodbc: database migration')
-makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick')
-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}
- "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
- "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-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=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951'
- 'SKIP'
- 'cebf23e858aee11e354c57d30de7a079754bdc2ef85eb684782458332a4b9651'
- 'SKIP'
- '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
- 'SKIP'
- 'b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005'
- '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
- '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
- 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
- '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593'
- '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
- '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11'
- '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
-
-prepare() {
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- # 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
- install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
-}
-
-build() {
- # this uses deprecated auto_ptr...
- # we known that, so do not flood the logs
- CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
-
- # Build mysql
- cd "${srcdir}/mysql-${_mysql_version}"
- cmake . \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build mysql-connector-c++
- cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
- cmake . \
- -Wno-dev \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
- -DMYSQL_DIR="${srcdir}/install-bundle/" \
- -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
-
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build gdal
- cd "${srcdir}/gdal-${_gdal_version}/"
- ./configure \
- --prefix=/usr \
- --includedir=/usr/include/gdal \
- --with-sqlite3 \
- --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
- --with-curl \
- --without-jasper
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build MySQL Workbench itself with bundled libs
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
- cmake . \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_CXX_FLAGS="-std=c++11" \
- -DCMAKE_BUILD_TYPE=Release \
- -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -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
- make
-}
-
-package() {
- # install bundled libraries files and files
- for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
- done
- for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- ln -s "$(readlink "${SYMLINK}")" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
- done
- install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/
-
- # install MySQL Workbench itself
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- make DESTDIR="${pkgdir}" install
-
- # icons
- for SIZE in 16 24 32 48 64 96 128; do
- convert -scale ${SIZE} \
- images/icons/linux/128x128/apps/mysql-workbench.png \
- ${srcdir}/mysql-workbench.png
- install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
- done
-
- install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
- "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
-}
-
Copied: mysql-workbench/repos/community-i686/PKGBUILD (from rev 221937, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,161 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.3.9
+pkgrel=3
+_mysql_version=5.7.18
+_connector_version=1.1.8
+_gdal_version=2.1.3
+_boost_version=1.59.0
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+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++')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
+ 'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick')
+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}
+ "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
+ "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-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=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951'
+ 'SKIP'
+ '0b5d71ed608656cd8181d3bb0434d3e36bac192899038dbdddf5a7594aaea1a2'
+ 'SKIP'
+ '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
+ 'SKIP'
+ 'b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005'
+ '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
+ '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593'
+ '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
+ '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11'
+ '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
+
+prepare() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # 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
+ install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
+}
+
+build() {
+ # this uses deprecated auto_ptr...
+ # we known that, so do not flood the logs
+ CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
+
+ # Build mysql
+ cd "${srcdir}/mysql-${_mysql_version}"
+ cmake . \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build mysql-connector-c++
+ cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
+ cmake . \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+ -DMYSQL_DIR="${srcdir}/install-bundle/" \
+ -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
+
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build gdal
+ cd "${srcdir}/gdal-${_gdal_version}/"
+ ./configure \
+ --prefix=/usr \
+ --includedir=/usr/include/gdal \
+ --with-sqlite3 \
+ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ --with-curl \
+ --without-jasper
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build MySQL Workbench itself with bundled libs
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_FLAGS="-std=c++11" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -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
+ make
+}
+
+package() {
+ # install bundled libraries files and files
+ for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
+ done
+ for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ ln -s "$(readlink "${SYMLINK}")" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
+ done
+ install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/
+
+ # install MySQL Workbench itself
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ make DESTDIR="${pkgdir}" install
+
+ # icons
+ for SIZE in 16 24 32 48 64 96 128; do
+ convert -scale ${SIZE} \
+ images/icons/linux/128x128/apps/mysql-workbench.png \
+ ${srcdir}/mysql-workbench.png
+ install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+ done
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+ "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
+}
+
Deleted: community-i686/arch_linux_profile.xml
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-i686/arch_linux_profile.xml (from rev 221937, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
Deleted: community-x86_64/0001-mysql-workbench-no-check-for-updates.patch
===================================================================
--- community-x86_64/0001-mysql-workbench-no-check-for-updates.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-x86_64/0001-mysql-workbench-no-check-for-updates.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,21 +0,0 @@
-diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
-index a32256c..08d9a21 100644
---- a/res/wbdata/main_menu.xml
-+++ b/res/wbdata/main_menu.xml
-@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="itemType">action</value>
- </value>
-
-+ <!-- We build a package that should be updated via pacman, so disable this check.
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
- <value type="string" key="name">checkUpdate</value>
- <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
- <value type="string" key="itemType">action</value>
-- </value>
-+ </value> //-->
-
- <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
Copied: mysql-workbench/repos/community-x86_64/0001-mysql-workbench-no-check-for-updates.patch (from rev 221937, mysql-workbench/trunk/0001-mysql-workbench-no-check-for-updates.patch)
===================================================================
--- community-x86_64/0001-mysql-workbench-no-check-for-updates.patch (rev 0)
+++ community-x86_64/0001-mysql-workbench-no-check-for-updates.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,21 @@
+diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
+index a32256c..08d9a21 100644
+--- a/res/wbdata/main_menu.xml
++++ b/res/wbdata/main_menu.xml
+@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="itemType">action</value>
+ </value>
+
++ <!-- We build a package that should be updated via pacman, so disable this check.
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ </value>
+@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili
+ <value type="string" key="name">checkUpdate</value>
+ <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+- </value>
++ </value> //-->
+
+ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
Deleted: community-x86_64/0002-disable-unsupported-operating-system-warning.patch
===================================================================
--- community-x86_64/0002-disable-unsupported-operating-system-warning.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-x86_64/0002-disable-unsupported-operating-system-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,29 +0,0 @@
-From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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
-
Copied: mysql-workbench/repos/community-x86_64/0002-disable-unsupported-operating-system-warning.patch (from rev 221937, mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch)
===================================================================
--- community-x86_64/0002-disable-unsupported-operating-system-warning.patch (rev 0)
+++ community-x86_64/0002-disable-unsupported-operating-system-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,29 @@
+From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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 at 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
+
Deleted: community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch
===================================================================
--- community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,36 +0,0 @@
-From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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
-
Copied: mysql-workbench/repos/community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch (from rev 221937, mysql-workbench/trunk/0003-add-option-to-hide-nonstandard-server-warning.patch)
===================================================================
--- community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch (rev 0)
+++ community-x86_64/0003-add-option-to-hide-nonstandard-server-warning.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,36 @@
+From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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 at 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
+
Deleted: community-x86_64/0004-fix-build-for-i686.patch
===================================================================
--- community-x86_64/0004-fix-build-for-i686.patch 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-x86_64/0004-fix-build-for-i686.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,140 +0,0 @@
-From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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
-
Copied: mysql-workbench/repos/community-x86_64/0004-fix-build-for-i686.patch (from rev 221937, mysql-workbench/trunk/0004-fix-build-for-i686.patch)
===================================================================
--- community-x86_64/0004-fix-build-for-i686.patch (rev 0)
+++ community-x86_64/0004-fix-build-for-i686.patch 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,140 @@
+From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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 at 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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-04-10 20:05:54 UTC (rev 221937)
+++ community-x86_64/PKGBUILD 2017-04-10 20:06:04 UTC (rev 221938)
@@ -1,161 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Alexandre Boily <alexandreboily at gmail.com>
-# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=mysql-workbench
-pkgver=6.3.9
-pkgrel=2
-_mysql_version=5.7.17
-_connector_version=1.1.8
-_gdal_version=2.1.3
-_boost_version=1.59.0
-pkgdesc='A cross-platform, visual database design tool developed by MySQL'
-arch=('i686' 'x86_64')
-url='https://www.mysql.com/products/workbench/'
-license=('GPL2')
-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++')
-optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
- 'python2-pyodbc: database migration')
-makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick')
-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}
- "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
- "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-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=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951'
- 'SKIP'
- 'cebf23e858aee11e354c57d30de7a079754bdc2ef85eb684782458332a4b9651'
- 'SKIP'
- '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
- 'SKIP'
- 'b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005'
- '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
- '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
- 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
- '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593'
- '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
- '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11'
- '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
-
-prepare() {
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- # 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
- install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
-}
-
-build() {
- # this uses deprecated auto_ptr...
- # we known that, so do not flood the logs
- CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
-
- # Build mysql
- cd "${srcdir}/mysql-${_mysql_version}"
- cmake . \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build mysql-connector-c++
- cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
- cmake . \
- -Wno-dev \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
- -DMYSQL_DIR="${srcdir}/install-bundle/" \
- -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
-
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build gdal
- cd "${srcdir}/gdal-${_gdal_version}/"
- ./configure \
- --prefix=/usr \
- --includedir=/usr/include/gdal \
- --with-sqlite3 \
- --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
- --with-curl \
- --without-jasper
- make
- make DESTDIR="${srcdir}/install-bundle/" install
-
- # Build MySQL Workbench itself with bundled libs
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
- cmake . \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_CXX_FLAGS="-std=c++11" \
- -DCMAKE_BUILD_TYPE=Release \
- -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
- -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
- make
-}
-
-package() {
- # install bundled libraries files and files
- for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
- done
- for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
- ln -s "$(readlink "${SYMLINK}")" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
- done
- install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/
-
- # install MySQL Workbench itself
- cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
-
- make DESTDIR="${pkgdir}" install
-
- # icons
- for SIZE in 16 24 32 48 64 96 128; do
- convert -scale ${SIZE} \
- images/icons/linux/128x128/apps/mysql-workbench.png \
- ${srcdir}/mysql-workbench.png
- install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
- done
-
- install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
- "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
-}
-
Copied: mysql-workbench/repos/community-x86_64/PKGBUILD (from rev 221937, mysql-workbench/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-04-10 20:06:04 UTC (rev 221938)
@@ -0,0 +1,161 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Alexandre Boily <alexandreboily at gmail.com>
+# Contributor: Illarion Kovalchuk <illarion.kovalchuk at gmail.com>
+# Contributor: totoloco <totoloco at gmail _dot_com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=mysql-workbench
+pkgver=6.3.9
+pkgrel=3
+_mysql_version=5.7.18
+_connector_version=1.1.8
+_gdal_version=2.1.3
+_boost_version=1.59.0
+pkgdesc='A cross-platform, visual database design tool developed by MySQL'
+arch=('i686' 'x86_64')
+url='https://www.mysql.com/products/workbench/'
+license=('GPL2')
+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++')
+optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager'
+ 'python2-pyodbc: database migration')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick')
+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}
+ "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}.tar.gz"{,.asc}
+ "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-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=('607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951'
+ 'SKIP'
+ '0b5d71ed608656cd8181d3bb0434d3e36bac192899038dbdddf5a7594aaea1a2'
+ 'SKIP'
+ '85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963'
+ 'SKIP'
+ 'b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005'
+ '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
+ '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
+ 'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
+ '0d65832bc5a73d4cfecef4b552bb78a30ce6020a5fabe5558dcf2ade8341b593'
+ '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
+ '68295716c55e5f7b07b3ec1162b512b33a0563952a0eb4ef6fd71d852c61de11'
+ '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
+
+prepare() {
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ # 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
+ install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
+}
+
+build() {
+ # this uses deprecated auto_ptr...
+ # we known that, so do not flood the logs
+ CXXFLAGS="${CXXFLAGS} -Wno-deprecated-declarations"
+
+ # Build mysql
+ cd "${srcdir}/mysql-${_mysql_version}"
+ cmake . \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build mysql-connector-c++
+ cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
+ cmake . \
+ -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+ -DMYSQL_DIR="${srcdir}/install-bundle/" \
+ -DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
+
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build gdal
+ cd "${srcdir}/gdal-${_gdal_version}/"
+ ./configure \
+ --prefix=/usr \
+ --includedir=/usr/include/gdal \
+ --with-sqlite3 \
+ --with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ --with-curl \
+ --without-jasper
+ make
+ make DESTDIR="${srcdir}/install-bundle/" install
+
+ # Build MySQL Workbench itself with bundled libs
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_FLAGS="-std=c++11" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
+ -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
+ make
+}
+
+package() {
+ # install bundled libraries files and files
+ for LIBRARY in $(find "${srcdir}/install-bundle/usr/lib/" -type f -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${LIBRARY}")"
+ done
+ for SYMLINK in $(find "${srcdir}/install-bundle/usr/lib/" -type l -regex '.*/lib\(gdal\|mysql\(client\|cppconn\)\)\.so\..*'); do
+ ln -s "$(readlink "${SYMLINK}")" "${pkgdir}"/usr/lib/mysql-workbench/"$(basename "${SYMLINK}")"
+ done
+ install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/
+
+ # install MySQL Workbench itself
+ cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
+
+ make DESTDIR="${pkgdir}" install
+
+ # icons
+ for SIZE in 16 24 32 48 64 96 128; do
+ convert -scale ${SIZE} \
+ images/icons/linux/128x128/apps/mysql-workbench.png \
+ ${srcdir}/mysql-workbench.png
+ install -D -m0644 ${srcdir}/mysql-workbench.png "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/mysql-workbench.png"
+ done
+
+ install -D -m 0644 "${srcdir}"/arch_linux_profile.xml \
+ "${pkgdir}"/usr/share/mysql-workbench/mysql.profiles/Arch_Linux_\(MariaDB\).xml
+}
+
Deleted: community-x86_64/arch_linux_profile.xml
===================================================================
(Binary files differ)
Copied: mysql-workbench/repos/community-x86_64/arch_linux_profile.xml (from rev 221937, mysql-workbench/trunk/arch_linux_profile.xml)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list