Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2016-07-15 12:53:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old) and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes 2015-06-24 20:57:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2016-07-15 12:53:23.000000000 +0200 @@ -1,0 +2,31 @@ +Tue Jul 12 14:46:04 UTC 2016 - [email protected] + +- Reduce some pointless comments +- Use normal paralel build +- Switch to pkgconfig style deps where possible +- Unbundle scintilla: + * mysql-workbench-unbundle-libscintilla.patch +- Use %cmake macros fully + +------------------------------------------------------------------- +Mon Jul 11 19:00:49 UTC 2016 - [email protected] + +- update to version 6.3.7 + https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-7.html + https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-6.html + https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-5.html +- dropped patches: + mysql-workbench-community-6.3.3-src-mysql_options4.patch +- refreshed patches: + mysql-workbench-cmake-3.2.patch + mysql-workbench-no-check-for-updates.patch + patch-desktop-categories.patch +- added patches: + mysql-workbench-mysql-version.patch - relax mysql version req. + mysql-workbench-mysql_options4.patch - disable options4, doesn't work as + supposed with MariaDB + mysql-workbench-no-json.patch - disable JSON support, no antlr3 in openSUSE +- removed support for unsupported distributions +- openSUSE_(Vendor_Package).xml renamed to openSUSE_Vendor_Package.xml + +------------------------------------------------------------------- Old: ---- mysql-workbench-community-6.3.3-src-mysql_options4.patch mysql-workbench-community-6.3.4-src.tar.gz openSUSE_(Vendor_Package).xml New: ---- mysql-workbench-community-6.3.7-src.tar.gz mysql-workbench-mysql-version.patch mysql-workbench-mysql_options4.patch mysql-workbench-no-json.patch mysql-workbench-unbundle-libscintilla.patch openSUSE_Vendor_Package.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.mXrl8r/_old 2016-07-15 12:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.mXrl8r/_new 2016-07-15 12:53:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mysql-workbench # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,104 +17,83 @@ %define edition community - -# whether at least Python 2.6 is available -%define have_python26 1 -%include %{_rpmconfigdir}/macros.python - +Name: mysql-workbench +Version: 6.3.7 +Release: 0 Summary: A MySQL visual database modeling, administration and querying tool License: GPL-2.0+ Group: Productivity/Databases/Clients -Name: mysql-workbench -Version: 6.3.4 -Release: 0 Url: http://wb.mysql.com -Source: %{name}-%{edition}-%{version}-src.tar.gz -Source1: openSUSE_(Vendor_Package).xml +Source: http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz +Source1: openSUSE_Vendor_Package.xml Source99: %{name}.rpmlintrc - #Patches -# PATCH-FIX-OPENSUSE -- Add categories and generic name to .desktop file Patch0: patch-desktop-categories.patch -# PATCH-FIX-OPENSUSE -- Remove "check for update" in help, we use a package manager for that -Patch2: mysql-workbench-no-check-for-updates.patch -# PATCH-FIX-OPENSUSE -- Fix build error "copytable.cpp:1638: undefined reference to `mysql_options4'" -# This only exist in mysql 5.6.x, but the "if" code didn't work, so disable it -Patch3: mysql-workbench-community-6.3.3-src-mysql_options4.patch +# Remove check for update in help +Patch1: mysql-workbench-no-check-for-updates.patch +# Fix build error +# copytable.cpp:1638: undefined reference to `mysql_options4' +# This only exist in mysql 5.6.x but the if code didn't work +# So disable it +Patch2: mysql-workbench-mysql_options4.patch # PATCH-FIX-UPSTREAM [email protected] -Patch4: mysql-workbench-cmake-3.2.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -# Keep them alphabetic order -BuildRequires: Mesa +Patch3: mysql-workbench-cmake-3.2.patch +# remove json +Patch5: %{name}-no-json.patch +Patch6: %{name}-mysql-version.patch +Patch7: mysql-workbench-unbundle-libscintilla.patch BuildRequires: Mesa-devel -BuildRequires: Mesa-libGL-devel BuildRequires: ant -#BuildRequires: ant-antlr -#BuildRequires: antlr-java >= 3.4 BuildRequires: boost-devel -BuildRequires: cairo-devel >= 1.5.12 -BuildRequires: cairomm-devel BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: glib2-devel BuildRequires: gnome-keyring-devel BuildRequires: gtkmm24-devel -BuildRequires: libctemplate-devel -BuildRequires: libgdal-devel -BuildRequires: libglade2-devel -BuildRequires: libgnome-devel BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel -BuildRequires: libmysqld-devel -BuildRequires: libsigc++2-devel +BuildRequires: libmysqld-devel > 5.1 +BuildRequires: libscintilla-devel BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: libzip-devel -BuildRequires: postgresql-devel +BuildRequires: pkgconfig +BuildRequires: python-paramiko +BuildRequires: swig +BuildRequires: tinyxml-devel BuildRequires: unixODBC-devel +BuildRequires: update-desktop-files BuildRequires: vsqlite++-devel -%if 0%{?suse_version} > 1210 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif -BuildRequires: make -BuildRequires: mysql-devel > 5.1 -BuildRequires: pcre-devel -BuildRequires: python-devel +BuildRequires: pkgconfig(cairo) >= 1.5.12 +BuildRequires: pkgconfig(cairomm-1.0) +BuildRequires: pkgconfig(gdal) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libctemplate) +BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(libgnome-2.0) +BuildRequires: pkgconfig(libpcrecpp) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzip) +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(proj) +BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(sigc++-2.0) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xxf86vm) -%if 0%{?suse_version} -BuildRequires: libuuid-devel -BuildRequires: sqlite3-devel -BuildRequires: update-desktop-files -%endif -%if 0%{?fedora} -BuildRequires: libuuid-devel -BuildRequires: sqlite-devel -%endif -BuildRequires: swig -BuildRequires: tar -BuildRequires: tinyxml-devel - -Requires(post): shared-mime-info -Requires(postun): shared-mime-info -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils - Requires: libmysqlclient-devel +Requires: proj Requires: python-paramiko Requires: python-pexpect - -# WAS in 5x Need for SQL Editor -#Requires: libmysqlclient_r18 - -## requires mysql client pkg (for mysqldump and mysql cmdline client) +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +Requires(post): shared-mime-info +Requires(postun): shared-mime-info Suggests: gnome-keyring Suggests: mysqldump - +Conflicts: mysql-workbench-com-se +Conflicts: mysql-workbench-oss Provides: mysql-administrator = %{version} Provides: mysql-gui-tools = %{version} Provides: mysql-querybrovser = %{version} @@ -122,8 +101,7 @@ Obsoletes: mysql-administrator < %{version} Obsoletes: mysql-gui-tools < %{version} Obsoletes: mysql-querybrovser < %{version} -Conflicts: mysql-workbench-oss -Conflicts: mysql-workbench-com-se +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description MySQL Workbench is a modeling tool that allows you to design @@ -133,108 +111,70 @@ This is the %{edition} build. %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 -%patch0 +%patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build -# FIX this is too much on obs Out of Memory use -# %%{?_smp_mflags} could it be in _constraint ? -# make %%{?jobs:-j2} - -export PATH=$PWD/bin:$PATH - -# Find and use antlr >= 3.4 but < 4.x -#export ANTLR_JAR_PATH=`find %%{_javadir} -name antlr-3.*-complete.jar` - -# Not using cmake macro as it sets modules LDFLAGS in way that -# workbench doesn't work afterwards - more investigation needed. -%if 0 -# Make things more secure, but only on new version - export LDFLAGS="-Wl,-z,relro,-z,now -pie" - %cmake -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \ - -DCMAKE_BUILD_TYPE=%{edition} \ - -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \ - -DUSE_UNIXODBC=TRUE \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_SKIP_INSTALL_RPATH=ON \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - .. - make VERBOSE=1 %{?jobs:-j2} -%else - pushd build - cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +# Drop the --no-undefined from LINKER flags as the cmakelists are too broken +%cmake \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \ -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \ - -DLIB_INSTALL_DIR=%{_libdir} \ -DCMAKE_BUILD_TYPE=%{edition} \ -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \ - -DUSE_UNIXODBC=TRUE \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_SKIP_INSTALL_RPATH=ON \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - .. - make VERBOSE=1 %{?jobs:-j2} - popd -%endif + -DUSE_UNIXODBC=TRUE +make %{?_smp_mflags} %install -pushd build -make VERBOSE=1 DESTDIR=%{buildroot} %{?jobs:-j2} install -popd -#Can't we split that in a -doc package ? -#rm -fr %%{buildroot}/usr/share/doc/%%{name} +%cmake_install find %{buildroot}%{_libdir}/%{name} -name \*.a -exec rm {} \; -print -find %{buildroot}%{_libdir}/%{name} -name \*.la -exec rm {} \; -print +find %{buildroot} -type f -name "*.la" -delete -print -install -m 0644 "%{S:1}" %{buildroot}/usr/share/mysql-workbench/mysql.profiles +install -m 0644 "%{SOURCE1}" %{buildroot}%{_datadir}/mysql-workbench/mysql.profiles -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/%{name}" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf -chmod 644 %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf - -# workaround for prob with libantlr3c not being detected as being provided by pkg in fedora -chmod +x %{buildroot}%{_libdir}/%{name}/*.so -%fdupes -s %{buildroot}%{_datadir}/%{name} +chmod 644 %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf # Check for duplicate files -%fdupes -s %{buildroot}%{_prefix} +%fdupes -s %{buildroot} %post +/sbin/ldconfig %icon_theme_cache_post %mime_database_post %desktop_database_post -/sbin/ldconfig %postun +/sbin/ldconfig %icon_theme_cache_postun %mime_database_postun %desktop_database_postun -/sbin/ldconfig %files %defattr(0644, root, root, 0755) - %dir %{_datadir}/doc/mysql-workbench %doc %{_datadir}/doc/mysql-workbench/COPYING %doc %{_datadir}/doc/mysql-workbench/README - %attr(0755,root,root) %{_bindir}/mysql* %attr(0755,root,root) %{_bindir}/wbcopytables %attr(0755,root,root) %{_libdir}/%{name}/%{name}-bin %attr(0755,root,root) %{_libdir}/%{name}/wbcopytables-bin - %dir %{_libdir}/%{name} %{_libdir}/%{name}/lib* %dir %{_libdir}/%{name}/modules %{_libdir}/%{name}/modules/* %dir %{_libdir}/%{name}/plugins %{_libdir}/%{name}/plugins/* - %dir %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/mimetypes/* %{_datadir}/icons/hicolor/*/apps/* @@ -244,7 +184,6 @@ %{_datadir}/applications/*.desktop %{_datadir}/%{name}/* %attr(0755,root,root) %{_datadir}/%{name}/extras/*.sh - %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf %changelog ++++++ mysql-workbench-cmake-3.2.patch ++++++ --- /var/tmp/diff_new_pack.mXrl8r/_old 2016-07-15 12:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.mXrl8r/_new 2016-07-15 12:53:25.000000000 +0200 @@ -1,32 +1,32 @@ -Index: mysql-workbench-community-6.3.4-src/CMakeLists.txt +Index: mysql-workbench-community-6.3.7-src/CMakeLists.txt =================================================================== ---- mysql-workbench-community-6.3.4-src.orig/CMakeLists.txt -+++ mysql-workbench-community-6.3.4-src/CMakeLists.txt -@@ -77,6 +77,7 @@ endif() - find_package(LibXml2 REQUIRED) +--- 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) find_package(OpenGL REQUIRED) + +find_package(X11 REQUIRED) - find_package(CTemplate) + find_package(CTemplate 2.2 REQUIRED) find_package(MySQLCppConn REQUIRED) -Index: mysql-workbench-community-6.3.4-src/frontend/linux/workbench/CMakeLists.txt +Index: mysql-workbench-community-6.3.7-src/frontend/linux/workbench/CMakeLists.txt =================================================================== ---- mysql-workbench-community-6.3.4-src.orig/frontend/linux/workbench/CMakeLists.txt -+++ mysql-workbench-community-6.3.4-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(. - ${MYSQLCPPCONN_INCLUDE_DIRS} ${GRT_INCLUDE_DIRS} ${GNOME_KEYRING_INCLUDE_DIRS} + ${VSQLITE_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} ) #link_directories(${PROJECT_BINARY_DIR}/mysqlcppconnector/lib ${PROJECT_BINARY_DIR}/antlr-wb) -@@ -103,6 +104,7 @@ target_link_libraries(mysql-workbench-bi - ${MYSQL_LIBRARIES} +@@ -118,6 +119,7 @@ target_link_libraries(mysql-workbench-bi + ${MySQL_LIBRARIES} ${SQLITE3_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} -+ ${X11_LIBRARIES} ++ ${X11_INCLUDE_DIR} ) - - install(TARGETS mysql-workbench-bin DESTINATION ${WB_INSTALL_DIR_EXECUTABLE}) + + if(COMMAND cotire) ++++++ mysql-workbench-community-6.3.4-src.tar.gz -> mysql-workbench-community-6.3.7-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.3.4-src.tar.gz /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-community-6.3.7-src.tar.gz differ: char 5, line 1 ++++++ mysql-workbench-mysql-version.patch ++++++ diff -Pdpru mysql-workbench-community-6.3.6-src.orig/CMakeLists.txt mysql-workbench-community-6.3.6-src/CMakeLists.txt --- mysql-workbench-community-6.3.6-src.orig/CMakeLists.txt 2015-12-10 14:46:20.000000000 +0100 +++ mysql-workbench-community-6.3.6-src/CMakeLists.txt 2015-12-19 17:10:20.222680326 +0100 @@ -101,7 +101,7 @@ find_python_module(paramiko 1.15.1 QUIET if(NOT PY_PARAMIKO) message(WARNING "Paramiko wasn't found, you can still build Workbench, but may not work properly.") endif() -find_package(MySQL 5.6.0 REQUIRED) +find_package(MySQL REQUIRED) if (UNIX) set(MYSQL_DEFINITIONS "-DBIG_JOINS=1" "-fno-strict-aliasing") endif() ++++++ mysql-workbench-mysql_options4.patch ++++++ Index: mysql-workbench-community-6.3.7-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 _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)) 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-check-for-updates.patch ++++++ --- /var/tmp/diff_new_pack.mXrl8r/_old 2016-07-15 12:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.mXrl8r/_new 2016-07-15 12:53:25.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml -index 3bfb79a..7efa4e7 100644 ---- a/res/wbdata/main_menu.xml -+++ b/res/wbdata/main_menu.xml -@@ -2665,6 +2665,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili +Index: mysql-workbench-community-6.3.7-src/res/wbdata/main_menu.xml +=================================================================== +--- mysql-workbench-community-6.3.7-src.orig/res/wbdata/main_menu.xml ++++ mysql-workbench-community-6.3.7-src/res/wbdata/main_menu.xml +@@ -2944,6 +2944,7 @@ value type="object" struct-name="app.Men <value type="string" key="itemType">action</value> </value> @@ -10,7 +10,7 @@ <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver"> <value type="string" key="itemType">separator</value> </value> -@@ -2675,7 +2676,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili +@@ -2954,7 +2955,7 @@ value type="object" struct-name="app.Men <value type="string" key="name">checkUpdate</value> <value type="string" key="command">plugin:wb.tools.checkForUpdates</value> <value type="string" key="itemType">action</value> ++++++ mysql-workbench-no-json.patch ++++++ 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: case sql::DataType::SET: type= "string"; break; - case sql::DataType::JSON: - type = "json"; - break; +// case sql::DataType::JSON: +// type = "json"; +// break; case sql::DataType::SQLNULL: type = "null"; 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"; default: return "UNKNOWN"; } @@ -241,7 +241,7 @@ RowBuffer::RowBuffer(boost::shared_ptr<s 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,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) { 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); ++++++ mysql-workbench-unbundle-libscintilla.patch ++++++ 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 wbbase grt cdbc - wbscintilla + 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) 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 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}) 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 ) -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") ++++++ patch-desktop-categories.patch ++++++ --- /var/tmp/diff_new_pack.mXrl8r/_old 2016-07-15 12:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.mXrl8r/_new 2016-07-15 12:53:25.000000000 +0200 @@ -1,10 +1,12 @@ ---- mysql-workbench.desktop.in 2013-08-09 17:32:50.000000000 +0200 -+++ mysql-workbench.desktop.in 2013-08-19 22:11:21.203796254 +0200 -@@ -6,4 +6,5 @@ +Index: mysql-workbench-community-6.3.7-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 +@@ -6,5 +6,6 @@ Terminal=false Type=Application Icon=mysql-workbench MimeType=application/vnd.mysql-workbench-model; -Categories=GTK;Database;Development; -\ No newline at end of file -+Categories=GTK;Development;Office;Database;GUIDesigner; ++Categories=Development;Office;Database;GUIDesigner; +GenericName=mysql-workbench + StartupWMClass=mysql-workbench-bin
