Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2020-07-03 00:01:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench"
Fri Jul 3 00:01:46 2020 rev:52 rq:799501 version:8.0.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2019-06-12 13:07:57.821141601 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-workbench.new.3060/mysql-workbench.changes
2020-07-03 00:03:00.118197098 +0200
@@ -1,0 +2,38 @@
+Fri May 1 08:31:21 UTC 2020 - Mykola Krachkovsky <[email protected]>
+
+- Updated to 8.0.19
+ * release notes
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-19.html
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-18.html
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-17.html
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-16.html
+- Dropped deprecated dependencies for python-paramiko, python-pexpect
+- Updated patch due to code changes
+ * updated mysql-workbench-hidpi.patch
+ * updated mysql-workbench-unbundle-libscintilla.patch
+ * updated mysql-workbench-warnings-fix.patch
+- Dropped prebuilt parsers as we now have antlr4 (new dependency),
+ and fixed call for our jar's
+ * removed mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
+ * removed mysql-workbench-prebuilt-parsers.patch
+ * added mysql-workbench-antlr4.patch
+- Merged and updated 2 MariaDB patches into one
+ * updated mysql-workbench-mariadb.patch
+ * removed mysql-workbench-mariadb-8.0.15.patch
+- Fixed dependecies for pcrecpp & zip
+ * added mysql-workbench-dependences.patch
+- Fixed unused call which leads to linking error
+ * added mysql-workbench-unused-glx-call.patch
+- Added dependency for rapidjson, jsonparser not included anymore
+ * removed git_patch_105207009.patch
+- Dropped unneeded preloading
+ * removed mysql-workbench-preload-sqlparser.patch
+
+-------------------------------------------------------------------
+Mon Mar 18 22:11:51 UTC 2019 - Mykola Krachkovsky <[email protected]>
+
+- fixed not found ldconfig if it's not in $PATH
+ (thanks Tyler Palmer for pointing out)
+ * added mysql-workbench-proj-ldconfig.patch
+
+-------------------------------------------------------------------
Old:
----
git_patch_105207009.patch
mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
mysql-workbench-community-8.0.15-src.tar.gz
mysql-workbench-mariadb-8.0.15.patch
mysql-workbench-prebuilt-parsers.patch
mysql-workbench-preload-sqlparser.patch
New:
----
mysql-workbench-antlr4.patch
mysql-workbench-community-8.0.19-src.tar.gz
mysql-workbench-dependences.patch
mysql-workbench-proj-ldconfig.patch
mysql-workbench-unused-glx-call.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.BdTrDq/_old 2020-07-03 00:03:06.730218990 +0200
+++ /var/tmp/diff_new_pack.BdTrDq/_new 2020-07-03 00:03:06.734219003 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,14 @@
%define edition community
Name: mysql-workbench
-Version: 8.0.15
+Version: 8.0.19
Release: 0
Summary: A MySQL visual database modeling, administration and querying
tool
License: GPL-2.0-only AND GPL-2.0-or-later
Group: Productivity/Databases/Clients
-Url: http://wb.mysql.com
+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
@@ -34,28 +33,30 @@
Patch1: mysql-workbench-no-check-for-updates.patch
# disabled , system scintila is buil with gtk3
Patch7: mysql-workbench-unbundle-libscintilla.patch
-Patch8: mysql-workbench-preload-sqlparser.patch
-# patch from https://bugs.mysql.com/bug.php?id=84886
-Patch11: git_patch_105207009.patch
+# PATCH-FIX-OPENSUSE fix lacking dependency
+Patch9: mysql-workbench-dependences.patch
Patch13: mysql-workbench-mariadb.patch
# PATCH-FIX-UPSTREAM [email protected]
Patch14: fix_aarch64_build.patch
# PATCH-FIX-OPENSUSE allow to both support keyring and start without it
Patch15: mysql-workbench-keyring-check.patch
-# PATCH-FIX-OPENSUSE fix build with MariaDB
-Patch16: mysql-workbench-mariadb-8.0.15.patch
# PATCH-FIX-UPSTREAM fix include path for old JDBC api with new
mysql-connector-cpp
Patch17: mysql-workbench-old-api.patch
# PATCH-FIX-UPSTREAM fix warning interpreted as errors
Patch18: mysql-workbench-warnings-fix.patch
-# PATCH-FIX-OPENSUSE disable parser building (while we have no maven in OBS)
-Patch19: mysql-workbench-prebuilt-parsers.patch
# PATCH-FIX-OPENSUSE fix License.txt location
Patch20: mysql-workbench-license-location.patch
# PATCH-FIX-UPSTREAM fix HiDPI support
Patch21: mysql-workbench-hidpi.patch
+# PATCH-FIX-OPENSUSE set explicitly ldconfig path
+Patch22: mysql-workbench-proj-ldconfig.patch
+# PATCH-FIX-OPENSUSE use system antlr4
+Patch23: mysql-workbench-antlr4.patch
+# PATCH-FIX-OPENSUSE drop unused glXQueryVersion call
+Patch24: mysql-workbench-unused-glx-call.patch
BuildRequires: Mesa-devel
BuildRequires: ant
+BuildRequires: antlr4-tool
BuildRequires: binutils-gold
BuildRequires: cmake
BuildRequires: dos2unix
@@ -74,7 +75,7 @@
BuildRequires: ninja
BuildRequires: pkgconfig
BuildRequires: python-devel
-BuildRequires: python-paramiko
+BuildRequires: rapidjson-devel
BuildRequires: swig
BuildRequires: tinyxml-devel
BuildRequires: unixODBC-devel
@@ -85,8 +86,6 @@
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(libsecret-1)
@@ -103,8 +102,6 @@
BuildRequires: pkgconfig(xxf86vm)
Requires: libmysqlclient-devel
Requires: proj
-Requires: python-paramiko
-Requires: python-pexpect
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
@@ -138,21 +135,7 @@
%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
-%patch7 -p1
-%patch8 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
+%autopatch -p1
%build
export CFLAGS="%{optflags}"
++++++ mysql-workbench-antlr4.patch ++++++
diff -uNr mysql-workbench-community-8.0.19-org/library/parsers/CMakeLists.txt
mysql-workbench-community-8.0.19-src/library/parsers/CMakeLists.txt
--- mysql-workbench-community-8.0.19-org/library/parsers/CMakeLists.txt
2020-04-05 00:09:04.733876842 +0300
+++ mysql-workbench-community-8.0.19-src/library/parsers/CMakeLists.txt
2020-04-04 20:54:21.868460175 +0300
@@ -22,7 +22,7 @@
add_custom_command(OUTPUT ${GENERATED_FILES}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/grammars/MySQLLexer.g4
${CMAKE_CURRENT_SOURCE_DIR}/grammars/MySQLParser.g4
- COMMAND ${Java_JAVA_EXECUTABLE} -Xmx1024m -jar ${ANTLR_JAR_PATH}
-Dlanguage=Cpp -listener -visitor -o ../mysql -package parsers
${CMAKE_CURRENT_SOURCE_DIR}/grammars/MySQLLexer.g4
${CMAKE_CURRENT_SOURCE_DIR}/grammars/MySQLParser.g4
+ COMMAND ${Java_JAVA_EXECUTABLE} -Xmx1024m -cp
/usr/share/java/antlr3-runtime.jar:/usr/share/java/antlr4/antlr4-runtime.jar:/usr/share/java/stringtemplate4/ST4.jar:/usr/share/java/antlr4/antlr4.jar
org.antlr.v4.Tool -Dlanguage=Cpp -listener -visitor -o ../mysql -package
parsers ${CMAKE_CURRENT_SOURCE_DIR}/grammars/MySQLLexer.g4
${CMAKE_CURRENT_SOURCE_DIR}/grammars/MySQLParser.g4
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/grammars
COMMENT "[mysql] Generating parser files..."
)
++++++ mysql-workbench-community-8.0.15-src.tar.gz ->
mysql-workbench-community-8.0.19-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-8.0.15-src.tar.gz
/work/SRC/openSUSE:Factory/.mysql-workbench.new.3060/mysql-workbench-community-8.0.19-src.tar.gz
differ: char 5, line 1
++++++ mysql-workbench-dependences.patch ++++++
--- mysql-workbench-community-8.0.19-org/backend/wbprivate/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
+++ mysql-workbench-community-8.0.19-src_n/backend/wbprivate/CMakeLists.txt
2020-04-07 00:19:53.325400406 +0300
@@ -97,6 +97,8 @@
mforms
wbpublic::wbpublic
Rapidjson::Rapidjson
+ pcrecpp
+ zip
)
add_library(wbprivate_Iface INTERFACE)
++++++ mysql-workbench-hidpi.patch ++++++
--- /var/tmp/diff_new_pack.BdTrDq/_old 2020-07-03 00:03:06.806219242 +0200
+++ /var/tmp/diff_new_pack.BdTrDq/_new 2020-07-03 00:03:06.806219242 +0200
@@ -1,6 +1,6 @@
---
mysql-workbench-community-8.0.15-org/backend/wbprivate/workbench/about_box.cpp
2019-01-30 15:32:36.000000000 +0200
+++
mysql-workbench-community-8.0.15-src/backend/wbprivate/workbench/about_box.cpp
2019-02-23 11:58:46.373377035 +0200
-@@ -108,6 +108,8 @@
+@@ -109,6 +109,8 @@
cairo_set_source_surface(cr, _back_image, 0, 0);
cairo_paint(cr);
cairo_identity_matrix(cr);
@@ -9,7 +9,7 @@
std::string version = base::strfmt(_("Version %i.%i.%i build %i %s (%i
bits)"), APP_MAJOR_NUMBER, APP_MINOR_NUMBER,
APP_RELEASE_NUMBER, APP_BUILD_NUMBER,
APP_RELEASE_TYPE, (int)sizeof(void *) * 8);
-@@ -124,6 +126,7 @@
+@@ -125,6 +127,7 @@
cairo_show_text(cr, _edition.c_str());
cairo_stroke(cr);
@@ -20,7 +20,7 @@
diff -uNr mysql-workbench-community-8.0.15-org/library/forms/utilities.cpp
mysql-workbench-community-8.0.15-src/library/forms/utilities.cpp
--- mysql-workbench-community-8.0.15-org/library/forms/utilities.cpp
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/library/forms/utilities.cpp
2019-02-23 14:22:55.683414594 +0200
-@@ -769,8 +769,8 @@
+@@ -791,8 +791,8 @@
if (backing_scale_factor > 1 && mforms::Utilities::is_hidpi_icon(image)) {
cairo_save(cr);
@@ -261,8 +261,8 @@
diff -uNr mysql-workbench-community-8.0.15-org/images/toolbar/CMakeLists.txt
mysql-workbench-community-8.0.15-src/images/toolbar/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/images/toolbar/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/images/toolbar/CMakeLists.txt
2019-02-23 00:06:39.446710703 +0200
-@@ -102,6 +102,27 @@
- wb_rel_nm.png
+@@ -108,6 +108,27 @@
+ wb_rel_nm_dark.png
wb_rubber.png
wb_toolbar_pages_18x18.png
[email protected]
++++++ mysql-workbench-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.BdTrDq/_old 2020-07-03 00:03:06.818219281 +0200
+++ /var/tmp/diff_new_pack.BdTrDq/_new 2020-07-03 00:03:06.818219281 +0200
@@ -1,7 +1,21 @@
-diff -uNr
mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp
mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp
----
mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp
2017-11-09 18:11:42.000000000 +0200
-+++ mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp
2018-02-05 11:51:59.083657042 +0200
-@@ -297,7 +297,7 @@
+diff -uNr
mysql-workbench-community-8.0.19-org/build/cmake/Modules/FindMySQL.cmake
mysql-workbench-community-8.0.19-src/build/cmake/Modules/FindMySQL.cmake
+--- mysql-workbench-community-8.0.19-org/build/cmake/Modules/FindMySQL.cmake
2020-04-05 00:00:02.702291848 +0300
++++ mysql-workbench-community-8.0.19-src/build/cmake/Modules/FindMySQL.cmake
2020-04-05 00:02:04.761297658 +0300
+@@ -72,8 +72,8 @@
+ )
+
+ find_file(MySQL_VERSION_FILE mysql_version.h ${MySQL_INCLUDE_DIRS})
+- file(STRINGS "${MySQL_VERSION_FILE}" MySQL_VERSION_LINE REGEX
"MYSQL_SERVER_VERSION")
+- string(REGEX REPLACE "#define MYSQL_SERVER_VERSION[
\t]+\"([0-9.]+)\"" "\\1" MySQL_VERSION "${MySQL_VERSION_LINE}")
++ file(STRINGS "${MySQL_VERSION_FILE}" MySQL_VERSION_LINE REGEX
"MARIADB_CLIENT_VERSION_STR")
++ string(REGEX REPLACE "#define MARIADB_CLIENT_VERSION_STR[
\t]+\"([0-9.]+)\"" "\\1" MySQL_VERSION "${MySQL_VERSION_LINE}")
+
+ # Find the library:
+ set(MySQL_LIBRARY_NAMES mysqlclient mysqlclient_r)
+diff -uNr
mysql-workbench-community-8.0.19-org/library/cdbc/src/driver_manager.cpp
mysql-workbench-community-8.0.19-src/library/cdbc/src/driver_manager.cpp
+--- mysql-workbench-community-8.0.19-org/library/cdbc/src/driver_manager.cpp
2020-04-05 00:00:02.686291978 +0300
++++ mysql-workbench-community-8.0.19-src/library/cdbc/src/driver_manager.cpp
2020-04-05 00:03:24.716646402 +0300
+@@ -307,7 +307,7 @@
if (properties.find("OPT_READ_TIMEOUT") == properties.end())
properties["OPT_READ_TIMEOUT"] = read_timeout;
}
@@ -10,7 +24,7 @@
properties["CLIENT_MULTI_STATEMENTS"] = true;
properties["metadataUseInfoSchema"] =
false; // I_S is way too slow for many things as of MySQL 5.6.10, so
disable it for now
-@@ -324,7 +324,7 @@
+@@ -334,7 +334,7 @@
properties.erase("sslCipher");
}
@@ -19,7 +33,7 @@
sql::ssl_mode sslMode = sql::SSL_MODE_DISABLED;
switch(sslModeWb)
{
-@@ -344,7 +344,7 @@
+@@ -355,7 +355,7 @@
sslMode = sql::SSL_MODE_VERIFY_IDENTITY;
break;
}
@@ -28,3 +42,42 @@
// If we are on a pipe connection then set the host name explicitly.
// However, pipe connections can only be established on the local box
(Win only).
+diff -uNr
mysql-workbench-community-8.0.19-org/plugins/migration/copytable/copytable.cpp
mysql-workbench-community-8.0.19-src/plugins/migration/copytable/copytable.cpp
+---
mysql-workbench-community-8.0.19-org/plugins/migration/copytable/copytable.cpp
2020-04-05 00:04:46.387981155 +0300
++++
mysql-workbench-community-8.0.19-src/plugins/migration/copytable/copytable.cpp
2020-04-04 23:02:21.010272555 +0300
+@@ -324,7 +324,7 @@
+ base::strfmt("Unhandled MySQL type %i for column '%s'",
col->target_type, col->target_name.c_str()));
+ }
+
+-#if MYSQL_VERSION_ID >= 80004
++#if MYSQL_VERSION_ID >= 80004 && !defined(MARIADB_BASE_VERSION)
+ typedef bool WB_BOOL;
+ #else
+ typedef my_bool WB_BOOL;
+@@ -2255,7 +2255,7 @@
+ case MYSQL_TYPE_DATETIME2:
+ case MYSQL_TYPE_TIME2:
+ #endif
+-#if MYSQL_VERSION_ID > 80016
++#if MYSQL_VERSION_ID > 80016 && !defined(MARIADB_BASE_VERSION)
+ case MYSQL_TYPE_TYPED_ARRAY: /* Used only for replication. */
+ #endif
+ // TODO: implement handling
+@@ -2270,6 +2270,8 @@
+
*(*_row_buffer)[col_index].length);
+ _bulk_insert_record.append("')");
+ break;
++ case MAX_NO_FIELD_TYPES:
++ break;
+ }
+ }
+
+@@ -2657,7 +2659,7 @@
+
+
+
+-#if MYSQL_VERSION_ID >= 50706
++#if MYSQL_VERSION_ID >= 50706 && !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-proj-ldconfig.patch ++++++
---
mysql-workbench-community-8.0.15-org/frontend/linux/workbench/mysql-workbench.in
2019-01-30 15:32:36.000000000 +0200
+++
mysql-workbench-community-8.0.15-src/frontend/linux/workbench/mysql-workbench.in
2019-03-19 00:07:59.377474514 +0200
@@ -26,7 +26,7 @@
# Check if PROJSO env is set and file exists, if not, try to handle this on
our own
if [[ -z "${PROJSO}" ]]; then
# Set the PROJSO env variable so gdal can find proj cause it's using dlopen
instead ld
- TMPLOC=`ldconfig -p | grep libproj\.so | awk '{printf $4;exit;}'`
+ TMPLOC=`/sbin/ldconfig -p | grep libproj\.so | awk '{printf $4;exit;}'`
if [[ -f "$TMPLOC" ]]; then
echo "Found $TMPLOC"
export PROJSO=$TMPLOC
++++++ mysql-workbench-unbundle-libscintilla.patch ++++++
--- /var/tmp/diff_new_pack.BdTrDq/_old 2020-07-03 00:03:06.838219348 +0200
+++ /var/tmp/diff_new_pack.BdTrDq/_new 2020-07-03 00:03:06.838219348 +0200
@@ -1,98 +1,159 @@
-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
+diff -uNr
mysql-workbench-community-8.0.19-org/backend/wbprivate/CMakeLists.txt
mysql-workbench-community-8.0.19-src/backend/wbprivate/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/backend/wbprivate/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/backend/wbprivate/CMakeLists.txt
2020-04-05 14:48:36.731862692 +0300
+@@ -112,6 +112,7 @@
+ SYSTEM INTERFACE
+ ${VSQLITE_INCLUDE_DIRS}
+ ${GDAL_INCLUDE_DIRS}
++ ${SCINTILLA_INCLUDE_DIRS}
+ )
+
+ add_dependencies(wbprivate generate_parser_mysql)
+diff -uNr mysql-workbench-community-8.0.19-org/backend/wbpublic/CMakeLists.txt
mysql-workbench-community-8.0.19-src/backend/wbpublic/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/backend/wbpublic/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/backend/wbpublic/CMakeLists.txt
2020-04-05 14:48:36.735862665 +0300
+@@ -157,6 +157,7 @@
+ ${GLIB_INCLUDE_DIRS}
+ ${MySQLCppConn_INCLUDE_DIRS}
+ ${GDAL_INCLUDE_DIRS}
++ ${SCINTILLA_INCLUDE_DIRS}
+ )
+
+
+@@ -181,6 +182,7 @@
+ target_include_directories(wbpublic_Iface
+ SYSTEM INTERFACE
+ $<BUILD_INTERFACE:${VSQLITE_INCLUDE_DIR}>
++ scintilla
+ )
+
+
+diff -uNr mysql-workbench-community-8.0.19-org/CMakeLists.txt
mysql-workbench-community-8.0.19-src/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/CMakeLists.txt 2019-12-15
21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/CMakeLists.txt 2020-04-05
14:48:36.735862665 +0300
+@@ -137,7 +137,7 @@
+ check_function_exists (strtoimax HAVE_STRTOIMAX)
+ check_function_exists (strtoumax HAVE_STRTOUMAX)
+
+-set(ANTLR_JAR_FILENAME "antlr-4.7.1-complete.jar")
++set(ANTLR_JAR_FILENAME "antlr4.jar")
+ get_filename_component(SOURCE_PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
+ set(LINUX_RES_BIN_DIR ${SOURCE_PARENT_DIR}/linux-res/bin)
+ if(WITH_ANTLR_JAR)
+@@ -153,6 +153,9 @@
+ message(WARNING ${ANTLR_JAR_FILENAME} " or java runtime wasn't found which
is required if you'd like to rebuild Lexer and Parser files")
+ endif()
+
++if (UNIX)
++ set(SCINTILLA_INCLUDE_DIRS /usr/include/scintilla)
++endif()
+
+ if (UNIX)
+ if (NOT LIB_INSTALL_DIR)
+diff -uNr mysql-workbench-community-8.0.19-org/ext/CMakeLists.txt
mysql-workbench-community-8.0.19-src/ext/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/ext/CMakeLists.txt 2019-12-15
21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/ext/CMakeLists.txt 2020-04-05
14:48:36.735862665 +0300
@@ -1 +0,0 @@
-add_subdirectory(scintilla/gtk)
-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 @@
+diff -uNr
mysql-workbench-community-8.0.19-org/frontend/linux/linux_utilities/CMakeLists.txt
mysql-workbench-community-8.0.19-src/frontend/linux/linux_utilities/CMakeLists.txt
+---
mysql-workbench-community-8.0.19-org/frontend/linux/linux_utilities/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++
mysql-workbench-community-8.0.19-src/frontend/linux/linux_utilities/CMakeLists.txt
2020-04-05 14:49:01.407717175 +0300
+@@ -19,6 +19,11 @@
+ ${PROJECT_SOURCE_DIR}/generated
+ )
+
++target_include_directories(linux_utilities
++ SYSTEM
++ PRIVATE
++ ${SCINTILLA_INCLUDE_DIRS}
++)
+
+
+ target_compile_options(linux_utilities PRIVATE
$<$<CXX_COMPILER_ID:GNU>:-rdynamic>)
+@@ -32,7 +37,7 @@
+ wbpublic::wbpublic
+ mforms::mforms
+ parsers::parsers
+- wbscintilla::wbscintilla
++ scintilla
+ )
+
+ add_library(linux_utilities_Iface INTERFACE)
+diff -uNr
mysql-workbench-community-8.0.19-org/frontend/linux/sqlide/CMakeLists.txt
mysql-workbench-community-8.0.19-src/frontend/linux/sqlide/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/frontend/linux/sqlide/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/frontend/linux/sqlide/CMakeLists.txt
2020-04-05 14:48:36.735862665 +0300
+@@ -18,6 +18,7 @@
+ PRIVATE
+ ${VSQLITE_INCLUDE_DIRS}
+ ${GTKMM_INCLUDE_DIRS}
++ ${SCINTILLA_INCLUDE_DIRS}
+ )
+
+
+diff -uNr mysql-workbench-community-8.0.19-org/library/forms/CMakeLists.txt
mysql-workbench-community-8.0.19-src/library/forms/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/library/forms/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/library/forms/CMakeLists.txt
2020-04-05 14:48:36.735862665 +0300
+@@ -103,6 +103,7 @@
+ SYSTEM
+ PRIVATE
+ ${LIBSECRET_INCLUDE_DIRS}
++ ${SCINTILLA_INCLUDE_DIRS}
+ )
+
+
+@@ -140,7 +141,7 @@
+ target_link_libraries(mforms_Iface INTERFACE
+ ${LIBSECRET_LIBRARIES}
wbbase
- grt
- cdbc
- wbscintilla
+ scintilla
- mdcanvasgtk
- mdcanvas
- 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
wbbase ${CAIRO_LIBRARIES} ${GTK3_LIBRARIES} ${LIBSECRET_LIBRARIES})
-+target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas scintilla
wbbase ${CAIRO_LIBRARIES} ${GTK3_LIBRARIES} ${LIBSECRET_LIBRARIES})
-
- set_source_files_properties(gtk/src/mforms_acc.cpp PROPERTIES COMPILE_FLAGS
-Wno-pragmas)
-
-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 @@
+ )
+
+
+diff -uNr
mysql-workbench-community-8.0.19-org/library/forms/swig/CMakeLists.txt
mysql-workbench-community-8.0.19-src/library/forms/swig/CMakeLists.txt
+--- mysql-workbench-community-8.0.19-org/library/forms/swig/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++ mysql-workbench-community-8.0.19-src/library/forms/swig/CMakeLists.txt
2020-04-05 14:48:36.735862665 +0300
+@@ -95,7 +95,7 @@
else()
swig_add_library(mforms LANGUAGE python SOURCES mforms.i)
endif()
--swig_link_libraries(mforms mforms wbscintilla ${GTK3_LIBRARIES}
${LIBXML2_LIBRARIES})
-+swig_link_libraries(mforms mforms scintilla ${GTK3_LIBRARIES}
${LIBXML2_LIBRARIES})
+-swig_link_libraries(mforms Boost::boost mforms wbscintilla wbbase::wbbase
wbpublic::wbpublic grt::grt ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
++swig_link_libraries(mforms Boost::boost mforms scintilla wbbase::wbbase
wbpublic::wbpublic grt::grt ${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
${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
-+target_link_libraries(db.mysql.diff.reporting.wbp grt mforms scintilla
${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
-
- 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(_mforms PRIVATE ${WB_CXXFLAGS})
+@@ -110,6 +110,7 @@
+ SYSTEM
+ PRIVATE
+ ${PYTHON_INCLUDE_DIRS}
++ ${SCINTILLA_INCLUDE_DIRS}
+ )
+
+
+diff -uNr
mysql-workbench-community-8.0.19-org/plugins/db.mysql.diff.reporting/CMakeLists.txt
mysql-workbench-community-8.0.19-src/plugins/db.mysql.diff.reporting/CMakeLists.txt
+---
mysql-workbench-community-8.0.19-org/plugins/db.mysql.diff.reporting/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++
mysql-workbench-community-8.0.19-src/plugins/db.mysql.diff.reporting/CMakeLists.txt
2020-04-05 14:48:36.735862665 +0300
+@@ -19,7 +19,7 @@
+ )
+
+ target_link_libraries(db.mysql.diff.reporting.wbp
+- PRIVATE wbpublic grt mforms wbscintilla cdbc db.mysql.wbp)
++ PRIVATE wbpublic grt mforms scintilla cdbc db.mysql.wbp)
+
+ if(BUILD_FOR_GCOV)
+ target_link_libraries(db.mysql.diff.reporting.wbp PRIVATE gcov)
+diff -uNr
mysql-workbench-community-8.0.19-org/plugins/wb.model.editors/linux/CMakeLists.txt
mysql-workbench-community-8.0.19-src/plugins/wb.model.editors/linux/CMakeLists.txt
+---
mysql-workbench-community-8.0.19-org/plugins/wb.model.editors/linux/CMakeLists.txt
2019-12-15 21:40:32.000000000 +0200
++++
mysql-workbench-community-8.0.19-src/plugins/wb.model.editors/linux/CMakeLists.txt
2020-04-05 14:48:36.735862665 +0300
+@@ -25,6 +25,11 @@
+ ${PROJECT_SOURCE_DIR}/modules
+ )
- target_compile_options(wb.model.snippets.wbp PUBLIC ${WB_CXXFLAGS})
++target_include_directories(wb.model.editors.wbp
++ SYSTEM
++ PRIVATE
++ ${SCINTILLA_INCLUDE_DIRS}
++)
--target_link_libraries(wb.model.snippets.wbp wbscintilla)
-+target_link_libraries(wb.model.snippets.wbp scintilla)
+ target_compile_options(wb.model.editors.wbp PRIVATE ${WB_CXXFLAGS})
- if(BUILD_FOR_TESTS)
- target_link_libraries(wb.model.snippets.wbp gcov)
++++++ mysql-workbench-unused-glx-call.patch ++++++
---
mysql-workbench-community-8.0.19-org/library/mysql.canvas/src/gtk/mdc_gtk_canvas_view.cpp
2019-12-15 21:40:32.000000000 +0200
+++
mysql-workbench-community-8.0.19-src_n/library/mysql.canvas/src/gtk/mdc_gtk_canvas_view.cpp
2020-04-06 22:06:09.731154484 +0300
@@ -30,10 +30,12 @@
using namespace mdc;
std::string mdc::detect_opengl_version() {
+ /*
int major, minor;
Display *dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
if (!glXQueryVersion(dpy, &major, &minor))
return ""; // glx not supported
+ */
return "";
}
++++++ mysql-workbench-warnings-fix.patch ++++++
--- /var/tmp/diff_new_pack.BdTrDq/_old 2020-07-03 00:03:06.850219387 +0200
+++ /var/tmp/diff_new_pack.BdTrDq/_new 2020-07-03 00:03:06.850219387 +0200
@@ -64,25 +64,10 @@
OGRErr ret_val = OGRGeometryFactory::createFromWkt(&d, NULL, &_geometry);
if (_geometry)
-diff -uNr mysql-workbench-community-8.0.15-org/library/base/util_functions.cpp
mysql-workbench-community-8.0.15-src/library/base/util_functions.cpp
---- mysql-workbench-community-8.0.15-org/library/base/util_functions.cpp
2019-01-30 15:32:36.000000000 +0200
-+++ mysql-workbench-community-8.0.15-src/library/base/util_functions.cpp
2019-02-16 13:56:53.711465800 +0200
-@@ -127,9 +127,9 @@
- while ((ptr = strstr(bptr, search)) != NULL) {
- __sappend(&res, &ressize, &reslen, bptr, (int)(ptr - bptr));
- bptr = ptr + searchlen;
-- __sappend(&res, &ressize, &reslen, replace, replsize);
-+ __sappend(&res, &ressize, &reslen, replace, 1 + replsize);
- }
-- __sappend(&res, &ressize, &reslen, bptr, (int)strlen(bptr));
-+ __sappend(&res, &ressize, &reslen, bptr, 1 + (int)strlen(bptr));
-
- return res;
- }
diff -uNr
mysql-workbench-community-8.0.15-org/library/forms/swig/CMakeLists.txt
mysql-workbench-community-8.0.15-src/library/forms/swig/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/library/forms/swig/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/library/forms/swig/CMakeLists.txt
2019-02-16 13:56:53.711465800 +0200
-@@ -91,7 +91,7 @@
+@@ -82,7 +82,7 @@
set(SOURCE_FILE_COMPILE_FLAGS "-Wno-missing-field-initializers
-Wno-parentheses")
if(CMAKE_COMPILER_IS_GNUCXX)
