Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2017-06-12 15:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old) and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench" Mon Jun 12 15:28:37 2017 rev:46 rq:500162 version:6.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes 2017-02-03 17:50:59.787919961 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2017-06-12 15:28:41.336032554 +0200 @@ -1,0 +2,13 @@ +Wed May 31 08:41:30 UTC 2017 - [email protected] + +- Update to version 6.3.9: + * https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-8.html + * https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-9.html + * resolves CVE-2017-3469 (boo#1035195) +- Add patches: + * mariadb-no-escape-string-quote.patch + * git_patch_105207009.patch + * mysql-workbench-gdal-use-CPLFree.patch +- Stop building on 32-bit architectures + +------------------------------------------------------------------- Old: ---- mysql-workbench-community-6.3.7-src.tar.gz New: ---- git_patch_105207009.patch mariadb-no-escape-string-quote.patch mysql-workbench-community-6.3.9-prebuilt_parsers.tar.gz mysql-workbench-community-6.3.9-src.tar.gz mysql-workbench-gdal-use-CPLFree.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:42.927808064 +0200 +++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:42.927808064 +0200 @@ -18,7 +18,7 @@ %define edition community Name: mysql-workbench -Version: 6.3.7 +Version: 6.3.9 Release: 0 Summary: A MySQL visual database modeling, administration and querying tool License: GPL-2.0+ @@ -26,6 +26,7 @@ Url: http://wb.mysql.com Source: http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz Source1: openSUSE_Vendor_Package.xml +Source2: %{name}-%{edition}-%{version}-prebuilt_parsers.tar.gz Source99: %{name}.rpmlintrc #Patches Patch0: patch-desktop-categories.patch @@ -46,28 +47,28 @@ Patch8: mysql-workbench-preload-sqlparser.patch # PATCH-FIX-UPSTREAM https://bugs.mysql.com/bug.php?id=83372 Patch9: mysql-workbench-gcc6.patch +Patch10: mariadb-no-escape-string-quote.patch +# patch from https://bugs.mysql.com/bug.php?id=84886 +Patch11: git_patch_105207009.patch +# Patch from https://git.archlinux.org/svntogit/community.git/tree/trunk/0005-gdal-use-CPLFree.patch?h=packages/mysql-workbench +Patch1700: mysql-workbench-gdal-use-CPLFree.patch BuildRequires: Mesa-devel BuildRequires: ant BuildRequires: binutils-gold -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes +BuildRequires: freetds-devel BuildRequires: gcc-c++ BuildRequires: gnome-keyring-devel -BuildRequires: gtkmm2-devel +BuildRequires: gtkmm3-devel BuildRequires: libmysqlclient-devel -BuildRequires: libmysqlcppconn-devel +BuildRequires: libmysqlcppconn-devel >= 1.1.8 BuildRequires: libmysqld-devel > 5.1 -BuildRequires: ninja -# use bundled scintilla lib -#BuildRequires: libscintilla-devel +BuildRequires: libscintilla-devel BuildRequires: libsigc++2-devel BuildRequires: libtool +BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: python-paramiko @@ -81,8 +82,8 @@ BuildRequires: pkgconfig(gdal) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libctemplate) -BuildRequires: pkgconfig(libglade-2.0) -BuildRequires: pkgconfig(libgnome-2.0) +#BuildRequires: pkgconfig(libglade-2.0) +#BuildRequires: pkgconfig(libgnome-2.0) BuildRequires: pkgconfig(libpcrecpp) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libxml-2.0) @@ -100,8 +101,8 @@ Requires: python-paramiko Requires: python-pexpect Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils Requires(post): shared-mime-info +Requires(postun): desktop-file-utils Requires(postun): shared-mime-info Suggests: gnome-keyring Suggests: mysqldump @@ -114,7 +115,13 @@ Obsoletes: mysql-administrator < %{version} Obsoletes: mysql-gui-tools < %{version} Obsoletes: mysql-querybrovser < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExcludeArch: %arm %ix86 +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +BuildRequires: libboost_system-devel +%else +BuildRequires: boost-devel +%endif %description MySQL Workbench is a modeling tool that allows you to design @@ -126,19 +133,33 @@ %prep # Add the -D flag if you don't want to delete the source root on each build %setup -q -n %{name}-%{edition}-%{version}-src +%setup -q -D -T -b 2 -n %{name}-%{edition}-%{version}-src %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch5 -p1 %patch6 -p1 -#%%patch7 -p1 +%patch7 -p1 %patch8 -p1 -%patch9 -p1 +#patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch1700 -p1 %build +export CFLAGS="%{optflags}" +pushd ext/antlr-runtime +autoreconf -fiv +%configure \ + --enable-64bit +make %{?_smp_mflags} +popd %define __builder ninja -export CXXFLAGS="%{optflags} -std=c++11" +# build will fail if -Werror is used on recent complires +sed -i "s|-Werror||g" CMakeLists.txt +# fix building on Leap +truncate -s0 library/base/boost_fix.cpp %cmake \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold -pie" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold -pie" \ ++++++ git_patch_105207009.patch ++++++ >From fff08d9ec68de8215fc8f12fe0ee42e598e1cf75 Mon Sep 17 00:00:00 2001 From: Christian Hesse <[email protected]> Date: Wed, 8 Feb 2017 13:26:51 +0100 Subject: [PATCH] fix build for 32bit systems --- 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; } ++++++ mariadb-no-escape-string-quote.patch ++++++ --- mysql-workbench-community-6.3.9-src.orig/plugins/migration/copytable/copytable.cpp 2016-10-14 15:12:03.000000000 +0300 +++ mysql-workbench-community-6.3.9-src/plugins/migration/copytable/copytable.cpp 2016-11-17 16:27:43.044632958 +0200 @@ -2847,7 +2847,7 @@ // This is needed because the escaping depends on the character set in use by the server unsigned long ret_length = 0; -#if MYSQL_CHECK_VERSION(5, 7, 6) +#if MYSQL_CHECK_VERSION(5, 7, 6) && !defined(MARIADB_BASE_VERSION) if (_target->is_mysql_version_at_least(5, 7, 6)) ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength, '"'); else ++++++ mysql-workbench-cmake-3.2.patch ++++++ --- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:42.995798475 +0200 +++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:42.995798475 +0200 @@ -1,32 +1,33 @@ -Index: mysql-workbench-community-6.3.7-src/CMakeLists.txt +Index: mysql-workbench-community-6.3.9-src/CMakeLists.txt =================================================================== ---- mysql-workbench-community-6.3.7-src.orig/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/CMakeLists.txt -@@ -117,6 +117,7 @@ find_package(LibXml2 REQUIRED) +--- mysql-workbench-community-6.3.9-src.orig/CMakeLists.txt ++++ mysql-workbench-community-6.3.9-src/CMakeLists.txt +@@ -131,6 +131,8 @@ find_package(LibXml2 REQUIRED) find_package(OpenGL REQUIRED) +find_package(X11 REQUIRED) - - find_package(CTemplate 2.2 REQUIRED) - find_package(MySQLCppConn REQUIRED) -Index: mysql-workbench-community-6.3.7-src/frontend/linux/workbench/CMakeLists.txt ++ + find_package(MySQLCppConn 1.1.8 REQUIRED) + find_package(VSqlite REQUIRED) + find_package(GDAL REQUIRED) +Index: mysql-workbench-community-6.3.9-src/frontend/linux/workbench/CMakeLists.txt =================================================================== ---- mysql-workbench-community-6.3.7-src.orig/frontend/linux/workbench/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/frontend/linux/workbench/CMakeLists.txt -@@ -50,6 +50,7 @@ include_directories(. - ${GRT_INCLUDE_DIRS} - ${GNOME_KEYRING_INCLUDE_DIRS} - ${VSQLITE_INCLUDE_DIRS} -+ ${X11_INCLUDE_DIR} +--- mysql-workbench-community-6.3.9-src.orig/frontend/linux/workbench/CMakeLists.txt ++++ mysql-workbench-community-6.3.9-src/frontend/linux/workbench/CMakeLists.txt +@@ -51,6 +51,7 @@ include_directories(. + SYSTEM ${GNOME_KEYRING_INCLUDE_DIRS} + SYSTEM ${VSQLITE_INCLUDE_DIRS} + SYSTEM ${Boost_INCLUDE_DIRS} ++ SYSTEM ${X11_INCLUDE_DIR} ) - #link_directories(${PROJECT_BINARY_DIR}/mysqlcppconnector/lib ${PROJECT_BINARY_DIR}/antlr-wb) -@@ -118,6 +119,7 @@ target_link_libraries(mysql-workbench-bi + +@@ -119,6 +120,7 @@ target_link_libraries(mysql-workbench-bi ${MySQL_LIBRARIES} ${SQLITE3_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} + ${X11_INCLUDE_DIR} ) - if(COMMAND cotire) + if(BUILD_FOR_TESTS) ++++++ mysql-workbench-community-6.3.7-src.tar.gz -> mysql-workbench-community-6.3.9-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.3.7-src.tar.gz /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-community-6.3.9-src.tar.gz differ: char 5, line 1 ++++++ mysql-workbench-gdal-use-CPLFree.patch ++++++ >From 97d26e5edfccead3fe3a10b732de51caa427eb60 Mon Sep 17 00:00:00 2001 From: Christian Hesse <[email protected]> Date: Tue, 16 May 2017 09:31:39 +0200 Subject: [PATCH 1/1] gdal: use CPLFree() OGRFree() is deprecated as of gdal 2.2.0, so use CPLFree() instead. Signed-off-by: Christian Hesse <[email protected]> --- backend/wbpublic/grt/spatial_handler.cpp | 4 ++-- backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/wbpublic/grt/spatial_handler.cpp b/backend/wbpublic/grt/spatial_handler.cpp index 9b357603..ee36fa03 100644 --- a/backend/wbpublic/grt/spatial_handler.cpp +++ b/backend/wbpublic/grt/spatial_handler.cpp @@ -443,7 +443,7 @@ spatial::Importer::Importer() : _geometry(NULL), _interrupt(false), _srid(0) { spatial::Importer::~Importer() { if (_geometry != NULL) - OGRFree(_geometry); + CPLFree(_geometry); } OGRGeometry *spatial::Importer::steal_data() { @@ -495,7 +495,7 @@ std::string spatial::Importer::as_wkt() { logError("Error exporting data to WKT (%i)\n", err); } else { std::string tmp(data); - OGRFree(data); + CPLFree(data); return tmp; } } diff --git a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp index d2eb8495..7a7948bf 100644 --- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp +++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp @@ -47,7 +47,7 @@ static grt::StringRef getGeoRepresentation(grt::StringRef data, bool outputAsJso OGRGeometryFactory::createFromWkb((unsigned char *)const_cast<char *>(&(*((*data).begin() + 4))), NULL, &geometry); if (ret_val != OGRERR_NONE) { if (geometry) - OGRFree(geometry); + CPLFree(geometry); throw std::exception(); } @@ -61,8 +61,8 @@ static grt::StringRef getGeoRepresentation(grt::StringRef data, bool outputAsJso if (err == OGRERR_NONE && data != NULL) { grt::StringRef tmp(data); - OGRFree(data); - OGRFree(geometry); + CPLFree(data); + CPLFree(geometry); return tmp; } else throw std::runtime_error("Conversion of OGR geometry data failed"); -- 2.13.0 ++++++ mysql-workbench-mysql_options4.patch ++++++ --- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:43.051790579 +0200 +++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:43.051790579 +0200 @@ -1,22 +1,16 @@ -Index: mysql-workbench-community-6.3.7-src/plugins/migration/copytable/copytable.cpp +Index: mysql-workbench-community-6.3.9-src/plugins/migration/copytable/copytable.cpp =================================================================== ---- mysql-workbench-community-6.3.7-src.orig/plugins/migration/copytable/copytable.cpp -+++ mysql-workbench-community-6.3.7-src/plugins/migration/copytable/copytable.cpp -@@ -1922,12 +1922,17 @@ _use_bulk_inserts(true), _bulk_insert_bu +--- mysql-workbench-community-6.3.9-src.orig/plugins/migration/copytable/copytable.cpp ++++ mysql-workbench-community-6.3.9-src/plugins/migration/copytable/copytable.cpp +@@ -1749,7 +1749,10 @@ _use_bulk_inserts(true), _bulk_insert_bu _incoming_data_charset = "latin1"; mysql_init(&_mysql); + /* This is optional has compiled in for MySQL >= 5.6.6 + * Looks like MariaDB does not support this as supposed, + * so disable completly. */ -+#if 0 - #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 MYSQL_CHECK_VERSION(5, 6, 6) ++#if MYSQL_CHECK_VERSION(5, 6, 6) && !defined(MARIADB_BASE_VERSION) + if (is_mysql_version_at_least(5, 6, 6)) mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); #endif - #endif -+#endif - - // _bulk_insert_record is used to prepare a single record string, the connection - // is needed to escape binary data properly ++++++ mysql-workbench-no-json.patch ++++++ --- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:43.063788887 +0200 +++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:43.067788322 +0200 @@ -1,9 +1,9 @@ diff -Pdpru mysql-workbench-community-6.3.5-src.orig/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp --- mysql-workbench-community-6.3.5-src.orig/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 2015-10-17 16:35:49.000000000 +0200 +++ mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 2015-11-12 06:33:10.787604909 +0100 -@@ -300,9 +300,9 @@ public: +@@ -314,9 +314,9 @@ public: case sql::DataType::SET: - type= "string"; + type = "string"; break; - case sql::DataType::JSON: - type = "json"; @@ -13,16 +13,18 @@ +// break; case sql::DataType::SQLNULL: type = "null"; - break; + break; diff -Pdpru mysql-workbench-community-6.3.5-src.orig/plugins/migration/copytable/copytable.cpp mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp --- mysql-workbench-community-6.3.5-src.orig/plugins/migration/copytable/copytable.cpp 2015-10-17 16:35:48.000000000 +0200 +++ mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp 2015-11-12 00:02:35.378227904 +0100 -@@ -79,7 +79,7 @@ static const char *mysql_field_type_to_n - 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"; +@@ -109,8 +109,8 @@ static const char *mysql_field_type_to_n + 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"; } @@ -33,24 +35,23 @@ - case MYSQL_TYPE_JSON: +// case MYSQL_TYPE_JSON: if (!col->is_long_data) - bind.buffer_length = (unsigned)col->source_length+1; + bind.buffer_length = (unsigned)col->source_length + 1; -@@ -1551,8 +1551,7 @@ bool MySQLCopyDataSource::fetch_row(RowB - 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) - { +@@ -1393,7 +1393,7 @@ bool MySQLCopyDataSource::fetch_row(RowB + rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB || + 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) { if (rowbuffer[index].buffer_length) free(rowbuffer[index].buffer); -@@ -2357,7 +2356,7 @@ bool MySQLCopyDataTarget::append_bulk_co - 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); + +@@ -2162,7 +2162,7 @@ bool MySQLCopyDataTarget::append_bulk_co + 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); ++++++ mysql-workbench-unbundle-libscintilla.patch ++++++ --- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:43.079786631 +0200 +++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:43.083786067 +0200 @@ -1,21 +1,27 @@ -Index: mysql-workbench-community-6.3.7-src/backend/wbpublic/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/backend/wbpublic/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/backend/wbpublic/CMakeLists.txt -@@ -189,7 +189,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL - endif() - - --target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc grt ${VSQLITE_LIBRARIES} wbscintilla mysqlparser ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${CTemplate_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES} ${GDAL_LIBRARIES}) -+target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc grt ${VSQLITE_LIBRARIES} scintilla mysqlparser ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${CTemplate_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES} ${GDAL_LIBRARIES}) - - set_target_properties(wbpublic - PROPERTIES VERSION ${WB_VERSION} -Index: mysql-workbench-community-6.3.7-src/frontend/linux/workbench/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/frontend/linux/workbench/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/frontend/linux/workbench/CMakeLists.txt -@@ -103,7 +103,7 @@ target_link_libraries(mysql-workbench-bi +diff -uNr mysql-workbench-community-6.3.9-src.orig/backend/wbpublic/CMakeLists.txt mysql-workbench-community-6.3.9-src/backend/wbpublic/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/backend/wbpublic/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/backend/wbpublic/CMakeLists.txt 2017-03-13 00:09:28.882117822 +0200 +@@ -181,7 +181,7 @@ + + target_compile_options(wbpublic PUBLIC ${WB_CXXFLAGS}) + +-target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc grt mtemplate ${VSQLITE_LIBRARIES} wbscintilla parsers ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES} ${GDAL_LIBRARIES}) ++target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc grt mtemplate ${VSQLITE_LIBRARIES} scintilla parsers ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES} ${GDAL_LIBRARIES}) + + if(BUILD_FOR_TESTS) + target_link_libraries(wbpublic gcov) +diff -uNr mysql-workbench-community-6.3.9-src.orig/ext/CMakeLists.txt mysql-workbench-community-6.3.9-src/ext/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/ext/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/ext/CMakeLists.txt 2017-03-13 00:31:39.596701003 +0200 +@@ -1,2 +1 @@ +-add_subdirectory(scintilla/gtk) +-file(MAKE_DIRECTORY "antlr-runtime/m4") +\ No newline at end of file ++file(MAKE_DIRECTORY "antlr-runtime/m4") +diff -uNr mysql-workbench-community-6.3.9-src.orig/frontend/linux/workbench/CMakeLists.txt mysql-workbench-community-6.3.9-src/frontend/linux/workbench/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/frontend/linux/workbench/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/frontend/linux/workbench/CMakeLists.txt 2017-03-13 00:09:19.606171515 +0200 +@@ -103,7 +103,7 @@ wbbase grt cdbc @@ -23,91 +29,73 @@ + scintilla mdcanvasgtk mdcanvas - mysqlparser -Index: mysql-workbench-community-6.3.7-src/library/forms/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/library/forms/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/library/forms/CMakeLists.txt -@@ -123,7 +123,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) - ) - endif() - --target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas wbscintilla ${CAIRO_LIBRARIES} ${GTK2_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${TINYXML_LIBRARY}) -+target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas scintilla ${CAIRO_LIBRARIES} ${GTK2_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${TINYXML_LIBRARY}) - - set_target_properties(mforms - PROPERTIES VERSION ${WB_VERSION} -Index: mysql-workbench-community-6.3.7-src/library/forms/swig/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/library/forms/swig/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/library/forms/swig/CMakeLists.txt -@@ -39,7 +39,7 @@ set(CMAKE_SWIG_FLAGS -w401,402,509) + parsers +diff -uNr mysql-workbench-community-6.3.9-src.orig/library/forms/CMakeLists.txt mysql-workbench-community-6.3.9-src/library/forms/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/library/forms/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/library/forms/CMakeLists.txt 2017-03-13 00:10:17.849812469 +0200 +@@ -132,7 +132,7 @@ + + target_compile_options(mforms PUBLIC ${WB_CXXFLAGS}) + +-target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas wbscintilla ${CAIRO_LIBRARIES} ${GTK3_LIBRARIES} ${GNOME_KEYRING_LIBRARIES}) ++target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas scintilla ${CAIRO_LIBRARIES} ${GTK3_LIBRARIES} ${GNOME_KEYRING_LIBRARIES}) + + if(BUILD_FOR_TESTS) + target_link_libraries(mforms gcov) +diff -uNr mysql-workbench-community-6.3.9-src.orig/library/forms/swig/CMakeLists.txt mysql-workbench-community-6.3.9-src/library/forms/swig/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/library/forms/swig/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/library/forms/swig/CMakeLists.txt 2017-03-13 00:10:43.853636877 +0200 +@@ -47,7 +47,7 @@ set_source_files_properties(mforms.i PROPERTIES CPLUSPLUS ON) set_property(SOURCE mforms.i PROPERTY SWIG_FLAGS -w512 -fvirtual -DSWIG_PYTHON_LEGACY_BOOL) swig_add_module(mforms python mforms.i) --swig_link_libraries(mforms mforms wbscintilla ${GTK2_LIBRARIES} ${LIBXML2_LIBRARIES}) -+swig_link_libraries(mforms mforms scintilla ${GTK2_LIBRARIES} ${LIBXML2_LIBRARIES}) - set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-Wno-missing-field-initializers -Wno-parentheses") - - set_target_properties(_mforms -Index: mysql-workbench-community-6.3.7-src/plugins/db.mysql.diff.reporting/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/plugins/db.mysql.diff.reporting/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/plugins/db.mysql.diff.reporting/CMakeLists.txt -@@ -39,7 +39,7 @@ set_target_properties(db.mysql.diff.repo +-swig_link_libraries(mforms mforms wbscintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES}) ++swig_link_libraries(mforms mforms scintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES}) + set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS ${SOURCE_FILE_COMPILE_FLAGS}) + + target_compile_options(_mforms PUBLIC ${WB_CXXFLAGS}) +diff -uNr mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.diff.reporting/CMakeLists.txt mysql-workbench-community-6.3.9-src/plugins/db.mysql.diff.reporting/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.diff.reporting/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/plugins/db.mysql.diff.reporting/CMakeLists.txt 2017-03-13 00:11:17.157400180 +0200 +@@ -42,7 +42,7 @@ PREFIX "" ) --target_link_libraries(db.mysql.diff.reporting.wbp grt mforms wbscintilla ${GTK2_LIBRARIES} ${LIBXML2_LIBRARIES}) -+target_link_libraries(db.mysql.diff.reporting.wbp grt mforms scintilla ${GTK2_LIBRARIES} ${LIBXML2_LIBRARIES}) +-target_link_libraries(db.mysql.diff.reporting.wbp grt mforms wbscintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES}) ++target_link_libraries(db.mysql.diff.reporting.wbp grt mforms scintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES}) - set_target_properties(db.mysql.diff.reporting.wbp - PROPERTIES PREFIX "" -Index: mysql-workbench-community-6.3.7-src/plugins/db.mysql.editors/linux/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/plugins/db.mysql.editors/linux/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/plugins/db.mysql.editors/linux/CMakeLists.txt -@@ -69,7 +69,7 @@ add_library(db.mysql.editors.wbp MODULE - - add_dependencies(db.mysql.editors.wbp mysqlparser) - --target_link_libraries(db.mysql.editors.wbp linux_utilities wbscintilla wbpublic ${GRT_LIBRARIES} ${GTK2_LIBRARIES} ${SIGC++_LIBRARIES}) -+target_link_libraries(db.mysql.editors.wbp linux_utilities scintilla wbpublic ${GRT_LIBRARIES} ${GTK2_LIBRARIES} ${SIGC++_LIBRARIES}) - - set_target_properties(db.mysql.editors.wbp - PROPERTIES PREFIX "" -Index: mysql-workbench-community-6.3.7-src/plugins/wb.model.snippets/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/plugins/wb.model.snippets/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/plugins/wb.model.snippets/CMakeLists.txt -@@ -29,7 +29,7 @@ add_library(wb.model.snippets.wbp MODULE - register_plugin.cpp - ) + if(BUILD_FOR_TESTS) + target_link_libraries(db.mysql.diff.reporting.wbp gcov) +diff -uNr mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.editors/linux/CMakeLists.txt mysql-workbench-community-6.3.9-src/plugins/db.mysql.editors/linux/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.editors/linux/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/plugins/db.mysql.editors/linux/CMakeLists.txt 2017-03-13 00:11:56.273107276 +0200 +@@ -72,7 +72,7 @@ + target_compile_options(db.mysql.editors.wbp PUBLIC ${WB_CXXFLAGS}) + + add_dependencies(db.mysql.editors.wbp parsers) +-target_link_libraries(db.mysql.editors.wbp linux_utilities wbscintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES}) ++target_link_libraries(db.mysql.editors.wbp linux_utilities scintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES}) + + if(BUILD_FOR_TESTS) + target_link_libraries(db.mysql.editors.wbp gcov) +@@ -94,7 +94,7 @@ + target_compile_options(db.mysql.editors.wbp.debug PUBLIC ${WB_CXXFLAGS}) + + add_dependencies(db.mysql.editors.wbp.debug parsers) +- target_link_libraries(db.mysql.editors.wbp.debug linux_utilities wbscintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES}) ++ target_link_libraries(db.mysql.editors.wbp.debug linux_utilities scintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES}) + target_link_libraries(db.mysql.editors.wbp.debug gcov) + set_target_properties(db.mysql.editors.wbp.debug + PROPERTIES VERSION ${WB_VERSION} +diff -uNr mysql-workbench-community-6.3.9-src.orig/plugins/wb.model.snippets/CMakeLists.txt mysql-workbench-community-6.3.9-src/plugins/wb.model.snippets/CMakeLists.txt +--- mysql-workbench-community-6.3.9-src.orig/plugins/wb.model.snippets/CMakeLists.txt 2017-02-03 20:40:18.000000000 +0200 ++++ mysql-workbench-community-6.3.9-src/plugins/wb.model.snippets/CMakeLists.txt 2017-03-13 00:12:41.684749892 +0200 +@@ -32,7 +32,7 @@ + + target_compile_options(wb.model.snippets.wbp PUBLIC ${WB_CXXFLAGS}) -target_link_libraries(wb.model.snippets.wbp wbscintilla) +target_link_libraries(wb.model.snippets.wbp scintilla) - set_target_properties(wb.model.snippets.wbp - PROPERTIES PREFIX "" -Index: mysql-workbench-community-6.3.7-src/modules/wb.mysql.import/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/modules/wb.mysql.import/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/modules/wb.mysql.import/CMakeLists.txt -@@ -24,7 +24,7 @@ add_library(wb.mysql.import.grt - src/wb_mysql_import_dbd4.cpp - ) - --target_link_libraries(wb.mysql.import.grt wbscintilla ${GRT_LIBRARIES} ${GTK2_LIBRARIES} ${SIGC++_LIBRARIES} ${TINYXML_LIBRARIES} ${MySQL_LIBRARIES}) -+target_link_libraries(wb.mysql.import.grt scintilla ${GRT_LIBRARIES} ${GTK2_LIBRARIES} ${SIGC++_LIBRARIES} ${TINYXML_LIBRARIES} ${MySQL_LIBRARIES}) - - set_target_properties(wb.mysql.import.grt - PROPERTIES PREFIX "" -Index: mysql-workbench-community-6.3.7-src/ext/CMakeLists.txt -=================================================================== ---- mysql-workbench-community-6.3.7-src.orig/ext/CMakeLists.txt -+++ mysql-workbench-community-6.3.7-src/ext/CMakeLists.txt -@@ -1,2 +1 @@ --add_subdirectory(scintilla/gtk) --file(MAKE_DIRECTORY "antlr-runtime/m4") -\ No newline at end of file -+file(MAKE_DIRECTORY "antlr-runtime/m4") + if(BUILD_FOR_TESTS) + target_link_libraries(wb.model.snippets.wbp gcov) ++++++ patch-desktop-categories.patch ++++++ --- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:43.119780990 +0200 +++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:43.119780990 +0200 @@ -1,11 +1,11 @@ -Index: mysql-workbench-community-6.3.7-src/mysql-workbench.desktop.in +Index: mysql-workbench-community-6.3.9-src/mysql-workbench.desktop.in =================================================================== ---- mysql-workbench-community-6.3.7-src.orig/mysql-workbench.desktop.in -+++ mysql-workbench-community-6.3.7-src/mysql-workbench.desktop.in +--- mysql-workbench-community-6.3.9-src.orig/mysql-workbench.desktop.in ++++ mysql-workbench-community-6.3.9-src/mysql-workbench.desktop.in @@ -6,5 +6,6 @@ Terminal=false Type=Application Icon=mysql-workbench - MimeType=application/vnd.mysql-workbench-model; + MimeType=application/vnd.mysql-workbench-model;application/sql; -Categories=GTK;Database;Development; +Categories=Development;Office;Database;GUIDesigner; +GenericName=mysql-workbench
