[arch-commits] Commit in mysql-workbench/trunk (4 files)

[Christian Hesse]

Date: Wednesday, February 8, 2017 @ 11:12:56
  Author: eworm
Revision: 211223

upgpkg: mysql-workbench 6.3.9-1

* upstream update (6.3.8 -> 6.3.9)
* build fixes and little tweaks
* upstream gdal update (2.1.2 -> 2.1.3)

Added:
  mysql-workbench/trunk/0002-disable-unsupported-operating-system-warning.patch
  mysql-workbench/trunk/0003-add-option-to-hide-nonstandard-server-warning.patch
  mysql-workbench/trunk/0004-fix-build-for-i686.patch
Modified:
  mysql-workbench/trunk/PKGBUILD

--+
 0002-disable-unsupported-operating-system-warning.patch  |   29 ++
 0003-add-option-to-hide-nonstandard-server-warning.patch |   36 +++
 0004-fix-build-for-i686.patch|  140 +
 PKGBUILD |   38 ++-
 4 files changed, 234 insertions(+), 9 deletions(-)

Added: 0002-disable-unsupported-operating-system-warning.patch
===
--- 0002-disable-unsupported-operating-system-warning.patch 
(rev 0)
+++ 0002-disable-unsupported-operating-system-warning.patch 2017-02-08 
11:12:56 UTC (rev 211223)
@@ -0,0 +1,29 @@
+From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001
+From: Christian Hesse 
+Date: Wed, 8 Feb 2017 09:12:24 +0100
+Subject: [PATCH 1/1] disable unsupported operating system warning
+
+Signed-off-by: Christian Hesse 
+---
+ 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
+

Added: 0003-add-option-to-hide-nonstandard-server-warning.patch
===
--- 0003-add-option-to-hide-nonstandard-server-warning.patch
(rev 0)
+++ 0003-add-option-to-hide-nonstandard-server-warning.patch2017-02-08 
11:12:56 UTC (rev 211223)
@@ -0,0 +1,36 @@
+From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse 
+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 
+---
+ 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 
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 
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
+

Added: 0004-fix-build-for-i686.patch
===
--- 0004-fix-build-for-i686.patch   (rev 0)
+++ 0004-fix-build-for-i686.patch   2017-02-08 11:12:56 UTC (rev 211223)
@@ -0,0 +1,140 @@
+From af2bff95077b376a21ba815505589f4ad6b62140 Mon Sep 17 00:00:00 2001
+From: 

[arch-commits] Commit in mysql-workbench/trunk (4 files)

[Christian Hesse]

Date: Thursday, October 22, 2015 @ 16:07:06
  Author: eworm
Revision: 144701

upgpkg: mysql-workbench 6.3.5-1

upstream release

Added:
  mysql-workbench/trunk/0013-mysql-workbench-no-json.patch
Modified:
  mysql-workbench/trunk/0010-mysql-workbench-object.patch
  mysql-workbench/trunk/PKGBUILD
Deleted:
  mysql-workbench/trunk/0011-mysql-workbench-swig.patch

+
 0010-mysql-workbench-object.patch  |   11 --
 0011-mysql-workbench-swig.patch|   40 
 0013-mysql-workbench-no-json.patch |   58 +++
 PKGBUILD   |   27 ++--
 4 files changed, 75 insertions(+), 61 deletions(-)

Modified: 0010-mysql-workbench-object.patch
===
--- 0010-mysql-workbench-object.patch   2015-10-22 14:00:53 UTC (rev 144700)
+++ 0010-mysql-workbench-object.patch   2015-10-22 14:07:06 UTC (rev 144701)
@@ -11,14 +11,3 @@
  mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", 
app_name.c_str());
  #endif
  #endif
-@@ -2871,8 +2871,8 @@ bool 
MySQLCopyDataTarget::InsertBuffer::append_escaped(const char *data, size_t
-   // This function is used to create a legal SQL string that you can use in 
an SQL statement
-   // This is needed because the escaping depends on the character set in use 
by the server
-   #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && 
defined(MYSQL_VERSION_PATCH)
--  #if MYSQL_CHECK_VERSION(5,7,6)
--if (is_mysql_version_at_least(5,7,6))
-+  #if MYSQL_CHECK_VERSION(5,7,6) && not defined(MARIADB_BASE_VERSION)
-+if (MySQLCopyDataTarget::is_mysql_version_at_least(5,7,6))
-   length += mysql_real_escape_string_quote(_mysql, buffer + length, data, 
(unsigned long)dlength);
- else
-   length += mysql_real_escape_string(_mysql, buffer + length, data, 
(unsigned long)dlength);

Deleted: 0011-mysql-workbench-swig.patch
===
--- 0011-mysql-workbench-swig.patch 2015-10-22 14:00:53 UTC (rev 144700)
+++ 0011-mysql-workbench-swig.patch 2015-10-22 14:07:06 UTC (rev 144701)
@@ -1,40 +0,0 @@
-From f972aaad2c9e762d61c43d93467b9e03010594cf Mon Sep 17 00:00:00 2001
-From: Christian Hesse 
-Date: Thu, 27 Aug 2015 20:23:03 +0200
-Subject: [PATCH 1/1] swig 3.0.6 changed behaviour again - revert
-
-Signed-off-by: Christian Hesse 

- library/forms/mforms/textbox.h | 2 +-
- library/forms/swig/mforms.i| 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/library/forms/mforms/textbox.h b/library/forms/mforms/textbox.h
-index d244a8f..1989592 100644
 a/library/forms/mforms/textbox.h
-+++ b/library/forms/mforms/textbox.h
-@@ -72,7 +72,7 @@ namespace mforms {
-   class MFORMS_EXPORT TextBox : public View
-   {
- #ifdef SWIG
--#if SWIG_VERSION < 0x030003   // starting with SWIG v3.0.3, this is no longer 
necessary (https://github.com/swig/swig/pull/201)
-+#if SWIG_VERSION < 0x030003 || SWIG_VERSION >= 0x030006   // starting with 
SWIG v3.0.3, this is no longer necessary (https://github.com/swig/swig/pull/201)
- //workaround for problem with unicode strings and default args in swig
- %rename(append_text_and_scroll) append_text(const std::string , bool 
scroll_to_end);
- %rename(append_text) append_text(const std::string );
-diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
-index 7e0775c..7ae6f6f 100644
 a/library/forms/swig/mforms.i
-+++ b/library/forms/swig/mforms.i
-@@ -1129,7 +1129,7 @@ SWIG_ADD_SIGNAL_VOID_CALLBACK(deactivated_callback, 
self->signal_deactivated());
- 
- %extend mforms::TextBox {
- SWIG_ADD_SIGNAL_VOID_CALLBACK(changed_callback, self->signal_changed());
--#if SWIG_VERSION >= 0x030003  // SWIG v3.0.3 changed its behaviour and broke 
compatibility (https://github.com/swig/swig/pull/201).  This is a workaround to 
make it work again.
-+#if SWIG_VERSION >= 0x030003 && SWIG_VERSION < 0x030006  // SWIG v3.0.3 
changed its behaviour and broke compatibility 
(https://github.com/swig/swig/pull/201).  This is a workaround to make it work 
again.
-  void append_text_and_scroll(const std::string , bool scroll_to_end= 
false)
-  {
-self->append_text(text, scroll_to_end);
--- 
-2.5.0
-

Added: 0013-mysql-workbench-no-json.patch
===
--- 0013-mysql-workbench-no-json.patch  (rev 0)
+++ 0013-mysql-workbench-no-json.patch  2015-10-22 14:07:06 UTC (rev 144701)
@@ -0,0 +1,58 @@
+diff --git a/plugins/migration/copytable/copytable.cpp 
b/plugins/migration/copytable/copytable.cpp
+index de52d91..2df53a4 100644
+--- a/plugins/migration/copytable/copytable.cpp
 b/plugins/migration/copytable/copytable.cpp
+@@ -79,7 +79,7 @@ static const char *mysql_field_type_to_name(enum 
enum_field_types type)
+ case MYSQL_TYPE_VAR_STRING: return 

[arch-commits] Commit in mysql-workbench/trunk (4 files)

[Christian Hesse]

Date: Thursday, April 23, 2015 @ 15:01:44
  Author: eworm
Revision: 132047

upgpkg: mysql-workbench 6.3.3-1

new upstream release

Added:
  mysql-workbench/trunk/0010-mysql-workbench-object.patch
Modified:
  mysql-workbench/trunk/PKGBUILD
Deleted:
  mysql-workbench/trunk/0006-mysql-workbench-column-label.patch
  mysql-workbench/trunk/0008-mysql-workbench-link-x11.patch

-+
 0006-mysql-workbench-column-label.patch |   44 --
 0008-mysql-workbench-link-x11.patch |   25 -
 0010-mysql-workbench-object.patch   |   24 
 PKGBUILD|   31 +++--
 4 files changed, 41 insertions(+), 83 deletions(-)

Deleted: 0006-mysql-workbench-column-label.patch
===
--- 0006-mysql-workbench-column-label.patch 2015-04-23 10:38:55 UTC (rev 
132046)
+++ 0006-mysql-workbench-column-label.patch 2015-04-23 13:01:44 UTC (rev 
132047)
@@ -1,44 +0,0 @@
-diff --git a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 
b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
-index 1b69f22..82de11f 100644
 a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
-+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
-@@ -241,7 +241,11 @@ public:
- const int last_column= meta-getColumnCount();
- for (int i = 1; i = last_column; i++)
- {
-+#ifdef MYSQLCPPCONN_VERSION_1_1_5
-+  column_by_name[meta-getColumnLabel(i)]= i;
-+#else
-   column_by_name[meta-getColumnName(i)]= i;
-+#endif
- 
-   std::string type;
-   switch (meta-getColumnType(i))
-@@ -308,7 +312,11 @@ public:
-   db_query_ResultsetColumnRef column(aself-get_grt());
- 
-   column-owner(aself);
-+#ifdef MYSQLCPPCONN_VERSION_1_1_5
-+  column-name(std::string(meta-getColumnLabel(i)));
-+#else
-   column-name(std::string(meta-getColumnName(i)));
-+#endif
-   column-columnType(type);
- 
-   self-columns().insert(column);
-diff --git a/modules/db.mysql.query/src/dbquery.cpp 
b/modules/db.mysql.query/src/dbquery.cpp
-index 428bad3..74db1dc 100644
 a/modules/db.mysql.query/src/dbquery.cpp
-+++ b/modules/db.mysql.query/src/dbquery.cpp
-@@ -521,7 +521,11 @@ std::string DbMySQLQueryImpl::resultFieldName(int result, 
int field)
- throw std::invalid_argument(Invalid resultset);
-   sql::ResultSet *res = _resultsets[result];
- 
-+#ifdef MYSQLCPPCONN_VERSION_1_1_5
-+  return res-getMetaData()-getColumnLabel(field);
-+#else
-   return res-getMetaData()-getColumnName(field);
-+#endif
- }
- 
- 

Deleted: 0008-mysql-workbench-link-x11.patch
===
--- 0008-mysql-workbench-link-x11.patch 2015-04-23 10:38:55 UTC (rev 132046)
+++ 0008-mysql-workbench-link-x11.patch 2015-04-23 13:01:44 UTC (rev 132047)
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76a886e..773d804 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_SOURCE_DIR}/build/cmake/Modu
- 
- find_package(PkgConfig REQUIRED)
- 
-+find_package(X11)
-+
- find_package(GTK2 2.20 REQUIRED gtk gtkmm)
- pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
- pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
-diff --git a/frontend/linux/workbench/CMakeLists.txt 
b/frontend/linux/workbench/CMakeLists.txt
-index b9c16c8..d52c34a 100644
 a/frontend/linux/workbench/CMakeLists.txt
-+++ b/frontend/linux/workbench/CMakeLists.txt
-@@ -92,6 +92,7 @@ target_link_libraries(mysql-workbench-bin
- mysqlparser
- ${MYSQLCPPCONN_LIBRARIES}
- ${CTEMPLATE_LIBRARIES}
-+${X11_LIBRARIES}
- ${GTK2_LIBRARIES}
- ${SIGC++_LIBRARIES}
- ${GRT_LIBRARIES}

Added: 0010-mysql-workbench-object.patch
===
--- 0010-mysql-workbench-object.patch   (rev 0)
+++ 0010-mysql-workbench-object.patch   2015-04-23 13:01:44 UTC (rev 132047)
@@ -0,0 +1,24 @@
+diff --git a/plugins/migration/copytable/copytable.cpp 
b/plugins/migration/copytable/copytable.cpp
+index 7b760e0..ec05d11 100644
+--- a/plugins/migration/copytable/copytable.cpp
 b/plugins/migration/copytable/copytable.cpp
+@@ -1922,7 +1922,7 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const 
std::string hostname, int port,
+   mysql_init(_mysql);
+ #if defined(MYSQL_VERSION_MAJOR)  defined(MYSQL_VERSION_MINOR)  
defined(MYSQL_VERSION_PATCH)
+ #if MYSQL_CHECK_VERSION(5,6,6)
+-  if (is_mysql_version_at_least(5,6,6))
++  if (_target-is_mysql_version_at_least(5,6,6))
+ mysql_options4(_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, program_name, 
app_name.c_str());
+ #endif
+ #endif
+@@ -2871,8 +2871,8 @@ bool 
MySQLCopyDataTarget::InsertBuffer::append_escaped(const char *data, size_t
+   // This function is used to create a legal SQL string that you can use in 
an SQL statement
+   // This