Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2019-06-12 13:07:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench"
Wed Jun 12 13:07:44 2019 rev:51 rq:685946 version:8.0.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2018-05-01 23:45:51.676006279 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-workbench.new.4811/mysql-workbench.changes
2019-06-12 13:07:57.821141601 +0200
@@ -1,0 +2,38 @@
+Sat Feb 23 10:12:28 UTC 2019 - Mykola Krachkovsky <[email protected]>
+
+- fixed HiDPI: about box now works on HiDPI and got sharper images
+ * added mysql-workbench-hidpi.patch
+- fixed License.txt location (Help -> Show License Info)
+ * added mysql-workbench-license-location.patch
+
+-------------------------------------------------------------------
+Sun Feb 17 08:27:27 UTC 2019 - Mykola Krachkovsky <[email protected]>
+
+- Updated to 8.0.15
+ * release notes:
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0.html
+ * prebuilt parsers regenerated
+ mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
+- fixed upstream
+ * removed mysql-workbench-cmake-3.2.patch
+ * removed mysql-workbench-gcc6.patch
+ * removed mysql-workbench-gdal-use-CPLFree.patch
+- system libraries update, no need for relaxing requirement anymore
+ * removed mysql-workbench-mysql-version.patch
+- MariaDB now supports JSON
+ * removed mysql-workbench-no-json.patch
+- MariaDB compatablity
+ * removed mariadb-no-escape-string-quote.patch, superseded by
+ * added mysql-workbench-mariadb-8.0.15.patch
+- fixed mysql-connector-cpp includes location
+ * added mysql-workbench-old-api.patch
+- fixed warning interpreted as errors
+ * added mysql-workbench-warnings-fix.patch
+- disabled generating of parser files
+ (which needs complete antlr4 which needs maven in openSUSE)
+ * added mysql-workbench-prebuilt-parsers.patch
+- fixed program start in case of keyring absence without
+ full keyring disabling
+ * added mysql-workbench-keyring-check.patch
+
+-------------------------------------------------------------------
Old:
----
mariadb-no-escape-string-quote.patch
mysql-workbench-cmake-3.2.patch
mysql-workbench-community-6.3.10-prebuilt_parsers.tar.gz
mysql-workbench-community-6.3.10-src.tar.gz
mysql-workbench-gcc6.patch
mysql-workbench-gdal-use-CPLFree.patch
mysql-workbench-mysql-version.patch
mysql-workbench-no-json.patch
New:
----
mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
mysql-workbench-community-8.0.15-src.tar.gz
mysql-workbench-hidpi.patch
mysql-workbench-keyring-check.patch
mysql-workbench-license-location.patch
mysql-workbench-mariadb-8.0.15.patch
mysql-workbench-old-api.patch
mysql-workbench-prebuilt-parsers.patch
mysql-workbench-warnings-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.KgHHYt/_old 2019-06-12 13:07:58.917141140 +0200
+++ /var/tmp/diff_new_pack.KgHHYt/_new 2019-06-12 13:07:58.933141133 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define edition community
Name: mysql-workbench
-Version: 6.3.10
+Version: 8.0.15
Release: 0
Summary: A MySQL visual database modeling, administration and querying
tool
License: GPL-2.0-only AND GPL-2.0-or-later
@@ -32,24 +32,28 @@
Patch0: patch-desktop-categories.patch
# Remove check for update in help
Patch1: mysql-workbench-no-check-for-updates.patch
-# PATCH-FIX-UPSTREAM [email protected]
-Patch3: mysql-workbench-cmake-3.2.patch
-# remove json
-Patch5: %{name}-no-json.patch
-Patch6: %{name}-mysql-version.patch
# disabled , system scintila is buil with gtk3
Patch7: mysql-workbench-unbundle-libscintilla.patch
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
-Patch12: mysql-workbench-gdal-use-CPLFree.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
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: binutils-gold
@@ -60,6 +64,7 @@
BuildRequires: gcc-c++
BuildRequires: gnome-keyring-devel
BuildRequires: gtkmm3-devel
+BuildRequires: libantlr4-runtime-devel >= 4.7.2
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel >= 1.1.8
BuildRequires: libmysqld-devel > 5.1
@@ -84,6 +89,8 @@
#BuildRequires: pkgconfig(libgnome-2.0)
BuildRequires: pkgconfig(libpcrecpp)
BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libsecret-1)
+BuildRequires: pkgconfig(libssh) >= 0.8.5
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libzip)
BuildRequires: pkgconfig(lua)
@@ -134,29 +141,21 @@
%setup -q -D -T -b 2 -n %{name}-%{edition}-%{version}-src
%patch0 -p1
%patch1 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
-#patch9 -p1
-%patch10 -p1
%patch11 -p1
-%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
%build
export CFLAGS="%{optflags}"
-pushd ext/antlr-runtime
-autoreconf -fiv
-%configure \
-%ifnarch x86_64
- --enable-abiflags=no \
-%endif
- --enable-64bit
-make %{?_smp_mflags}
-popd
%define __builder ninja
# build will fail if -Werror is used on recent complires
sed -i "s|-Werror||g" CMakeLists.txt
@@ -170,7 +169,7 @@
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=TRUE
-%make_jobs
+%cmake_build
%install
%cmake_install
@@ -186,6 +185,8 @@
rm -r %{buildroot}%{_datadir}/mime-info
+rm -r %{buildroot}%{_datadir}/doc/mysql-workbench
+
# Check for duplicate files
%fdupes -s %{buildroot}
@@ -203,9 +204,8 @@
%files
%defattr(0644, root, root, 0755)
-%dir %{_datadir}/doc/mysql-workbench
-%doc %{_datadir}/doc/mysql-workbench/COPYING
-%doc %{_datadir}/doc/mysql-workbench/README
+%license License.txt
+%doc README.md AUTHORS ChangeLog
%attr(0755,root,root) %{_bindir}/mysql*
%attr(0755,root,root) %{_bindir}/wbcopytables
%attr(0755,root,root) %{_libdir}/%{name}/%{name}-bin
++++++ mysql-workbench-community-6.3.10-prebuilt_parsers.tar.gz ->
mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz ++++++
++++ 1096141 lines of diff (skipped)
++++++ mysql-workbench-community-6.3.10-src.tar.gz ->
mysql-workbench-community-8.0.15-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.3.10-src.tar.gz
/work/SRC/openSUSE:Factory/.mysql-workbench.new.4811/mysql-workbench-community-8.0.15-src.tar.gz
differ: char 5, line 1
++++++ mysql-workbench-hidpi.patch ++++++
---
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 @@
cairo_set_source_surface(cr, _back_image, 0, 0);
cairo_paint(cr);
cairo_identity_matrix(cr);
+ const double fix_scale = _scale_factor > 1 ? 2 / _scale_factor : 1;
+ cairo_scale(cr, fix_scale, fix_scale);
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 @@
cairo_show_text(cr, _edition.c_str());
cairo_stroke(cr);
+ cairo_identity_matrix(cr);
}
//--------------------------------------------------------------------------------------------------
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 @@
if (backing_scale_factor > 1 && mforms::Utilities::is_hidpi_icon(image)) {
cairo_save(cr);
- cairo_scale(cr, 1 / backing_scale_factor, 1 / backing_scale_factor);
- cairo_set_source_surface(cr, image, x * backing_scale_factor, y *
backing_scale_factor);
+ cairo_scale(cr, 0.5, 0.5);
+ cairo_set_source_surface(cr, image, x * 2, y * 2);
if (alpha == 1.0)
cairo_paint(cr);
else
diff -uNr mysql-workbench-community-8.0.15-org/library/forms/widgets.cpp
mysql-workbench-community-8.0.15-src/library/forms/widgets.cpp
--- mysql-workbench-community-8.0.15-org/library/forms/widgets.cpp
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/library/forms/widgets.cpp
2019-02-23 14:26:49.293546912 +0200
@@ -701,7 +701,7 @@
if (icon != NULL) {
float scale;
if (mforms::Utilities::is_hidpi_icon(icon) && (scale =
mforms::App::get()->backing_scale_factor()) > 1)
- cairo_scale(cr, 1 / scale, 1 / scale);
+ cairo_scale(cr, 0.5, 0.5);
cairo_set_source_surface(cr, icon, 0, 0);
cairo_paint(cr);
}
diff -uNr mysql-workbench-community-8.0.15-org/images/admin/CMakeLists.txt
mysql-workbench-community-8.0.15-src/images/admin/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/images/admin/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/images/admin/CMakeLists.txt
2019-02-22 23:58:55.094005199 +0200
@@ -81,6 +81,83 @@
wb-backup-logo-small.png
wb-backup-logo.png
wb_perform_config.png
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
)
install(FILES ${IMAGE_FILES} DESTINATION ${WB_PACKAGE_SHARED_DIR}/images)
diff -uNr mysql-workbench-community-8.0.15-org/images/grt/CMakeLists.txt
mysql-workbench-community-8.0.15-src/images/grt/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/images/grt/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/images/grt/CMakeLists.txt
2019-02-23 00:11:07.436883095 +0200
@@ -149,6 +149,26 @@
structs/workbench.physical.oracle.Model.48x48.png
structs/workbench.physical.sqlite.Model.48x48.png
structs/workbench.physical.sybase.Model.48x48.png
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
+ structs/[email protected]
)
install(FILES ${IMAGE_FILES} DESTINATION ${WB_PACKAGE_SHARED_DIR}/images)
diff -uNr mysql-workbench-community-8.0.15-org/images/home/CMakeLists.txt
mysql-workbench-community-8.0.15-src/images/home/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/images/home/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/images/home/CMakeLists.txt
2019-02-22 23:46:26.023192481 +0200
@@ -27,6 +27,19 @@
wb_tile_user_light.png
home_screen_close_dark.png
home_screen_close_light.png
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
)
install(FILES ${IMAGE_FILES} DESTINATION ${WB_PACKAGE_SHARED_DIR}/images)
diff -uNr mysql-workbench-community-8.0.15-org/images/sql/CMakeLists.txt
mysql-workbench-community-8.0.15-src/images/sql/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/images/sql/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/images/sql/CMakeLists.txt
2019-02-23 00:05:36.143142419 +0200
@@ -104,6 +104,71 @@
wb_item_overlay_execute.png
wb_item_overlay_inspector.png
wb_item_overlay_result.png
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
)
install(FILES ${IMAGE_FILES} DESTINATION ${WB_PACKAGE_SHARED_DIR}/images)
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
wb_rubber.png
wb_toolbar_pages_18x18.png
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
)
install(FILES ${IMAGE_FILES} DESTINATION ${WB_PACKAGE_SHARED_DIR}/images)
diff -uNr mysql-workbench-community-8.0.15-org/images/ui/CMakeLists.txt
mysql-workbench-community-8.0.15-src/images/ui/CMakeLists.txt
--- mysql-workbench-community-8.0.15-org/images/ui/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/images/ui/CMakeLists.txt
2019-02-22 23:39:56.825343961 +0200
@@ -155,6 +155,24 @@
session.png
folder.png
session-switch.png
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
)
if (UNIX)
++++++ mysql-workbench-keyring-check.patch ++++++
diff -uNr
mysql-workbench-community-8.0.15-org/frontend/linux/workbench/mysql-workbench.in
mysql-workbench-community-8.0.15-src/frontend/linux/workbench/mysql-workbench.in
---
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-02-16 13:56:53.711465800 +0200
@@ -4,6 +4,9 @@
# This will cause passwords to be stored only temporarily for the session.
#WB_NO_GNOME_KEYRING=1
+dbus-send --session --dest=org.freedesktop.secrets --type=method_call
--print-reply /org/freedesktop/secrets
org.freedesktop.DBus.Introspectable.Introspect || export WB_NO_KEYRING=1
+
+
# force disable the Mac style single menu hack in Ubuntu Unity
export UBUNTU_MENUPROXY=0
++++++ mysql-workbench-license-location.patch ++++++
--- mysql-workbench-community-8.0.15-org/frontend/linux/workbench/main_form.cpp
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/frontend/linux/workbench/main_form.cpp
2019-02-22 23:34:44.515070418 +0200
@@ -1499,7 +1499,7 @@
auto parts = base::split(bec::GRTManager::get()->get_basedir(), "/");
std::string last = parts.back();
parts.pop_back();
- parts.push_back("doc");
+ parts.push_back("licenses"); // used only for License.txt
parts.push_back(last);
parts.push_back(file);
return base::join(parts, "/");
++++++ mysql-workbench-mariadb-8.0.15.patch ++++++
diff -uNr
mysql-workbench-community-8.0.15-org/build/cmake/Modules/FindMySQL.cmake
mysql-workbench-community-8.0.15-src/build/cmake/Modules/FindMySQL.cmake
--- mysql-workbench-community-8.0.15-org/build/cmake/Modules/FindMySQL.cmake
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/build/cmake/Modules/FindMySQL.cmake
2019-02-16 13:56:53.711465800 +0200
@@ -72,8 +72,10 @@
)
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
"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.15-org/plugins/migration/copytable/copytable.cpp
mysql-workbench-community-8.0.15-src/plugins/migration/copytable/copytable.cpp
---
mysql-workbench-community-8.0.15-org/plugins/migration/copytable/copytable.cpp
2019-01-30 15:32:36.000000000 +0200
+++
mysql-workbench-community-8.0.15-src/plugins/migration/copytable/copytable.cpp
2019-02-16 13:57:00.203423071 +0200
@@ -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;
@@ -2264,6 +2264,8 @@
*(*_row_buffer)[col_index].length);
_bulk_insert_record.append("')");
break;
+ case MAX_NO_FIELD_TYPES:
+ break;
}
}
@@ -2651,7 +2653,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-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.KgHHYt/_old 2019-06-12 13:08:00.449140495 +0200
+++ /var/tmp/diff_new_pack.KgHHYt/_new 2019-06-12 13:08:00.457140492 +0200
@@ -28,51 +28,3 @@
// 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-6.3.10-src.org/library/sql.parser/source/my_config.h
mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h
----
mysql-workbench-community-6.3.10-src.org/library/sql.parser/source/my_config.h
1970-01-01 03:00:00.000000000 +0300
-+++ mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h
2018-02-05 14:09:01.328469741 +0200
-@@ -0,0 +1,44 @@
-+// include everything from system my_config.h
-+#include_next <my_config.h>
-+
-+// add charsets for workbench
-+#define HAVE_CHARSET_armscii8 1
-+#define HAVE_CHARSET_ascii 1
-+#define HAVE_CHARSET_big5 1
-+#define HAVE_CHARSET_cp1250 1
-+#define HAVE_CHARSET_cp1251 1
-+#define HAVE_CHARSET_cp1256 1
-+#define HAVE_CHARSET_cp1257 1
-+#define HAVE_CHARSET_cp850 1
-+#define HAVE_CHARSET_cp852 1
-+#define HAVE_CHARSET_cp866 1
-+#define HAVE_CHARSET_cp932 1
-+#define HAVE_CHARSET_dec8 1
-+#define HAVE_CHARSET_eucjpms 1
-+#define HAVE_CHARSET_euckr 1
-+#define HAVE_CHARSET_gb2312 1
-+#define HAVE_CHARSET_gbk 1
-+#define HAVE_CHARSET_geostd8 1
-+#define HAVE_CHARSET_greek 1
-+#define HAVE_CHARSET_hebrew 1
-+#define HAVE_CHARSET_hp8 1
-+#define HAVE_CHARSET_keybcs2 1
-+#define HAVE_CHARSET_koi8r 1
-+#define HAVE_CHARSET_koi8u 1
-+#define HAVE_CHARSET_latin1 1
-+#define HAVE_CHARSET_latin2 1
-+#define HAVE_CHARSET_latin5 1
-+#define HAVE_CHARSET_latin7 1
-+#define HAVE_CHARSET_macce 1
-+#define HAVE_CHARSET_macroman 1
-+#define HAVE_CHARSET_sjis 1
-+#define HAVE_CHARSET_swe7 1
-+#define HAVE_CHARSET_tis620 1
-+#define HAVE_CHARSET_ucs2 1
-+#define HAVE_CHARSET_ujis 1
-+#define HAVE_CHARSET_utf8mb4 1
-+#define HAVE_CHARSET_utf8mb3 1
-+#define HAVE_CHARSET_utf8 1
-+#define HAVE_CHARSET_utf16 1
-+#define HAVE_CHARSET_utf32 1
-+#define HAVE_UCA_COLLATIONS 1
++++++ mysql-workbench-no-check-for-updates.patch ++++++
--- /var/tmp/diff_new_pack.KgHHYt/_old 2019-06-12 13:08:00.465140489 +0200
+++ /var/tmp/diff_new_pack.KgHHYt/_new 2019-06-12 13:08:00.465140489 +0200
@@ -1,21 +1,18 @@
-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>
-
-+ <!-- We build a package that should be updated via pacman, so disable
this check.
- <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.checkver">
- <value type="string" key="itemType">separator</value>
- </value>
-@@ -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>
-- </value>
-+ </value> //-->
-
- <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.report_a_bug">
- <value type="string" key="itemType">separator</value>
+--- mysql-workbench-community-8.0.15-org/res/wbdata/main_menu.xml
2019-01-30 15:32:36.000000000 +0200
++++ mysql-workbench-community-8.0.15-src/res/wbdata/main_menu.xml
2019-02-16 17:37:48.075876063 +0200
+@@ -2571,6 +2571,7 @@
+ <value type="string"
key="command">builtin:show_log_file</value>
+ <value type="string" key="itemType">action</value>
+ </value>
++ <!--
+ <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.checkver">
+ <value type="string" key="itemType">separator</value>
+ <value type="string"
key="accessibilityName">Separator</value>
+@@ -2583,6 +2584,7 @@
+ <value type="string"
key="command">plugin:wb.tools.checkForUpdates</value>
+ <value type="string" key="itemType">action</value>
+ </value>
++ -->
+ <value type="object" struct-name="app.MenuItem"
id="com.mysql.wb.menu.separator.help.report_a_bug">
+ <value type="string" key="itemType">separator</value>
+ <value type="string" key="platform">windows,linux</value>
++++++ mysql-workbench-old-api.patch ++++++
diff -uNr
mysql-workbench-community-8.0.15-org/build/cmake/Modules/FindMySQLCppConn.cmake
mysql-workbench-community-8.0.15-src/build/cmake/Modules/FindMySQLCppConn.cmake
---
mysql-workbench-community-8.0.15-org/build/cmake/Modules/FindMySQLCppConn.cmake
2019-01-30 15:32:36.000000000 +0200
+++
mysql-workbench-community-8.0.15-src/build/cmake/Modules/FindMySQLCppConn.cmake
2019-02-16 13:56:53.711465800 +0200
@@ -27,7 +27,7 @@
set(MySQLCppConn_FIND_QUIETLY TRUE)
endif ()
-find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include
/usr/local/include)
+find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS
/usr/include/jdbc /usr/local/include/jdbc)
SET(MySQLCppConn_NAMES mysqlcppconn)
++++++ mysql-workbench-prebuilt-parsers.patch ++++++
--- mysql-workbench-community-8.0.15-org/library/parsers/CMakeLists.txt
2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/library/parsers/CMakeLists.txt
2019-02-16 22:38:33.885890360 +0200
@@ -31,19 +31,19 @@
set (GENERATED_FILES ${GENERATED_OTHERS} ${GENERATED_SOURCES})
-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
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/grammars
- COMMENT "[mysql] Generating parser files..."
- )
+#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
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/grammars
+# COMMENT "[mysql] Generating parser files..."
+# )
add_custom_target(generate_parser_mysql
ALL
DEPENDS ${GENERATED_FILES})
-set_source_files_properties(${GENERATED_FILES} PROPERTIES GENERATED TRUE)
+#set_source_files_properties(${GENERATED_FILES} PROPERTIES GENERATED TRUE)
set(PARSERS_SOURCES
${GENERATED_SOURCES}
++++++ mysql-workbench-unbundle-libscintilla.patch ++++++
--- /var/tmp/diff_new_pack.KgHHYt/_old 2019-06-12 13:08:00.497140475 +0200
+++ /var/tmp/diff_new_pack.KgHHYt/_new 2019-06-12 13:08:00.497140475 +0200
@@ -13,11 +13,8 @@
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 @@
+@@ -1 +0,0 @@
-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
@@ -37,18 +34,18 @@
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})
+-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)
- 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)
+ 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})
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS ${SOURCE_FILE_COMPILE_FLAGS})
++++++ mysql-workbench-warnings-fix.patch ++++++
diff -uNr
mysql-workbench-community-8.0.15-org/backend/wbpublic/grt/spatial_handler.cpp
mysql-workbench-community-8.0.15-src/backend/wbpublic/grt/spatial_handler.cpp
---
mysql-workbench-community-8.0.15-org/backend/wbpublic/grt/spatial_handler.cpp
2019-01-30 15:32:36.000000000 +0200
+++
mysql-workbench-community-8.0.15-src/backend/wbpublic/grt/spatial_handler.cpp
2019-02-16 13:56:53.711465800 +0200
@@ -86,7 +86,7 @@
return "";
}
OGRSpatialReference srs;
- char *_wkt = (char *)const_cast<char *>(&(*(wkt.begin())));
+ const char *_wkt = wkt.c_str();
OGRErr err = srs.importFromWkt(&_wkt);
if (err != OGRERR_NONE) {
logError("ImportWKT Error: %s", stringFromErrorCode(err).c_str());
@@ -275,7 +275,7 @@
CPLSetErrorHandler(&ogr_error_handler);
OGRRegisterAll();
- char *m_wkt = const_cast<char *>(
+ const char *m_wkt = (
"PROJCS[\"World_Mercator\", "
"GEOGCS[\"GCS_WGS_1984\", "
"DATUM[\"WGS_1984\", "
@@ -291,7 +291,7 @@
"AUTHORITY[\"EPSG\",\"54004\"]]");
_mercator_srs.importFromWkt(&m_wkt);
- char *e_wkt = const_cast<char *>(
+ const char *e_wkt = (
"PROJCS[\"World_Equidistant_Cylindrical\","
"GEOGCS[\"GCS_WGS_1984\","
"DATUM[\"WGS_1984\","
@@ -307,7 +307,7 @@
"AUTHORITY[\"EPSG\",\"54002\"]]");
_equirectangular_srs.importFromWkt(&e_wkt);
- char *r_wkt = const_cast<char *>(
+ const char *r_wkt = (
"PROJCS[\"World_Robinson\","
"GEOGCS[\"GCS_WGS_1984\","
"DATUM[\"WGS_1984\","
@@ -322,7 +322,7 @@
"AUTHORITY[\"EPSG\",\"54030\"]]");
_robinson_srs.importFromWkt(&r_wkt);
- char *g_wkt = const_cast<char *>(
+ const char *g_wkt = (
"GEOGCS[\"WGS 84\", "
"DATUM[\"WGS_1984\", "
"SPHEROID[\"WGS 84\",6378137,298.257223563, "
@@ -335,7 +335,7 @@
"AUTHORITY[\"EPSG\",\"4326\"]]");
_geodetic_srs.importFromWkt(&g_wkt);
- char *b_wkt = const_cast<char *>(
+ const char *b_wkt = (
"PROJCS[\"World_Bonne\", "
"GEOGCS[\"GCS_WGS_1984\", "
"DATUM[\"WGS_1984\", "
@@ -509,7 +509,7 @@
}
int spatial::Importer::import_from_wkt(std::string data) {
- char *d = &(*data.begin());
+ const char *d = data.c_str();
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 @@
set(SOURCE_FILE_COMPILE_FLAGS "-Wno-missing-field-initializers
-Wno-parentheses")
if(CMAKE_COMPILER_IS_GNUCXX)
- set(SOURCE_FILE_COMPILE_FLAGS "${SOURCE_FILE_COMPILE_FLAGS}
-Wno-maybe-uninitialized -Wno-stringop-truncation -Wno-cast-function-type")
+ set(SOURCE_FILE_COMPILE_FLAGS "${SOURCE_FILE_COMPILE_FLAGS}
-Wno-maybe-uninitialized -Wno-stringop-truncation -Wno-cast-function-type
-Wno-error=stringop-overflow= ")
endif()
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS ${SOURCE_FILE_COMPILE_FLAGS})
