[arch-commits] Commit in mysql-workbench/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Thu Oct 22 14:07:06 UTC 2015
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 <mail at eworm.de>
-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 <mail at eworm.de>
----
- 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 &text, bool scroll_to_end);
- %rename(append_text) append_text(const std::string &text);
-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 &text, 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 "MYSQL_TYPE_VAR_STRING";
+ case MYSQL_TYPE_STRING: return "MYSQL_TYPE_STRING";
+ case MYSQL_TYPE_GEOMETRY: return "MYSQL_TYPE_GEOMETRY";
+- case MYSQL_TYPE_JSON: return "MYSQL_TYPE_JSON";
++// case MYSQL_TYPE_JSON: return "MYSQL_TYPE_JSON";
+ default:
+ return "UNKNOWN";
+ }
+@@ -241,7 +241,7 @@ RowBuffer::RowBuffer(boost::shared_ptr<std::vector<ColumnInfo> > columns,
+ case MYSQL_TYPE_STRING:
+ case MYSQL_TYPE_VAR_STRING:
+ case MYSQL_TYPE_BIT:
+- case MYSQL_TYPE_JSON:
++// case MYSQL_TYPE_JSON:
+ if (!col->is_long_data)
+ bind.buffer_length = (unsigned)col->source_length+1;
+
+@@ -1551,8 +1551,8 @@ bool MySQLCopyDataSource::fetch_row(RowBuffer &rowbuffer)
+ rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB ||
+ rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
+ rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
+- rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY ||
+- rowbuffer[index].buffer_type == MYSQL_TYPE_JSON)
++ rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY)
++// rowbuffer[index].buffer_type == MYSQL_TYPE_JSON)
+ {
+ if (rowbuffer[index].buffer_length)
+ free(rowbuffer[index].buffer);
+@@ -2357,7 +2357,7 @@ bool MySQLCopyDataTarget::append_bulk_column(size_t col_index)
+ case MYSQL_TYPE_STRING:
+ case MYSQL_TYPE_ENUM:
+ case MYSQL_TYPE_SET:
+- case MYSQL_TYPE_JSON:
++// case MYSQL_TYPE_JSON:
+ _bulk_insert_record.append("'", 1);
+ ret_val = _bulk_insert_record.append_escaped((char*)(*_row_buffer)[col_index].buffer, *(*_row_buffer)[col_index].length);
+ _bulk_insert_record.append("'", 1);
+diff --git a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
+index f5c2ffb..b42ba6a 100644
+--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
++++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
+@@ -300,9 +300,9 @@ public:
+ case sql::DataType::SET:
+ type= "string";
+ break;
+- case sql::DataType::JSON:
++ /* case sql::DataType::JSON:
+ type = "json";
+- break;
++ break; */
+ case sql::DataType::SQLNULL:
+ type = "null";
+ break;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-22 14:00:53 UTC (rev 144700)
+++ PKGBUILD 2015-10-22 14:07:06 UTC (rev 144701)
@@ -6,8 +6,8 @@
# Contributor: Ionut Biru <ibiru at archlinux.org>
pkgname=mysql-workbench
-pkgver=6.3.4
-pkgrel=7
+pkgver=6.3.5
+pkgrel=1
pkgdesc='A cross-platform, visual database design tool developed by MySQL'
arch=('i686' 'x86_64')
url='https://www.mysql.com/products/workbench/'
@@ -29,18 +29,18 @@
'0007-mysql-workbench-no-set-gtid-purged.patch'
'0009-mysql-workbench-gnome-keyring.patch'
'0010-mysql-workbench-object.patch'
- '0011-mysql-workbench-swig.patch'
'0012-mysql-workbench-cpp11.patch'
+ '0013-mysql-workbench-no-json.patch'
'arch_linux_profile.xml')
-sha256sums=('be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3'
+sha256sums=('7a63d05cfb5dec60ece3e73869eb61afc7125e4a8a18e53d760cd7ca0479dc84'
'SKIP'
'9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
'9c2ae2fe7a4f59502bdcf591a07353c350b0ba29c3935c8242d97848cc0e50d3'
- 'c8bbaee5d601333730bd200baa9514e880e4c5277b1241a67e267b602b400ded'
- 'ac110e12ec775dd18400dc3e8ed2b0502ad857ea2b4c6c509481eaed1991a646'
+ '2bc79f935cd5059409d32aa64832b7aa2c49ba533cc93d40a063bcbfe01a4485'
'f76ffa7343b758ac0de2448e948c533e8623a0e426d293602ab7261c853ec684'
+ '663b6eed3715988e16a695f5810bdfb7e76aaeb28baaf4b11b2a73ee2bcb403d'
'28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
prepare() {
@@ -59,15 +59,22 @@
# fix cannot call member function without object
patch -Np1 < "${srcdir}"/0010-mysql-workbench-object.patch
- # fix the swig workaround
- patch -Np1 < "${srcdir}"/0011-mysql-workbench-swig.patch
-
# fix for C++11
# http://bugs.mysql.com/bug.php?id=78668
patch -Np1 < "${srcdir}"/0012-mysql-workbench-cpp11.patch
+ # we have no JSON, probably missing in mariadb
+ patch -Np1 < "${srcdir}"/0013-mysql-workbench-no-json.patch
+
+ # fix the swig workaround
+ sed -i '/SWIG_VERSION/s/0x030008/0x030006/' \
+ library/forms/mforms/textbox.h \
+ library/forms/swig/mforms.i
+
# fix GDAL
- sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h
+ sed -i '/#include/s|gdal/||' \
+ backend/wbpublic/grtui/geom_draw_box.h \
+ backend/wbpublic/grt/spatial_handler.h
# put antlr into place
install -D ${srcdir}/antlr-3.4-complete.jar ${srcdir}/linux-res/bin/antlr-3.4-complete.jar
More information about the arch-commits
mailing list