From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- .../files/mysql-workbench-6.2.5-wbcopytables.patch | 12 -- .../mysql-workbench-8.0.19-mysql-connector-8.patch | 12 -- .../mysql-workbench-8.0.21-boost-1.73.0.patch | 123 --------------------- 3 files changed, 147 deletions(-) delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch (limited to 'dev-db/mysql-workbench/files') diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch deleted file mode 100644 index 2d3d8db243f8..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.000000000 +0100 -+++ b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100 -@@ -10,7 +10,8 @@ - if (UNIX) - configure_file(wbcopytables.in wbcopytables) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION ${WB_INSTALL_BIN_DIR}) -- -+ -+ SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}") - add_executable(wbcopytables-bin - copytable/copytable.cpp - copytable/python_copy_data_source.cpp diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch deleted file mode 100644 index c624dea0e56d..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake b/build/cmake/Modules/FindMySQLCppConn.cmake ---- a/build/cmake/Modules/FindMySQLCppConn.cmake 2019-12-18 13:31:34.520496484 +0100 -+++ b/build/cmake/Modules/FindMySQLCppConn.cmake 2019-12-18 13:32:32.590496631 +0100 -@@ -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 /usr/include/jdbc /usr/local/include /usr/local/include/jdbc) - - SET(MySQLCppConn_NAMES mysqlcppconn) - diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch deleted file mode 100644 index 85825f14c047..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch +++ /dev/null @@ -1,123 +0,0 @@ -Patch from Alt Linux as provided in https://bugs.gentoo.org/723432 - -diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i -index cb74ba41..05535e56 100644 ---- a/library/forms/swig/mforms.i -+++ b/library/forms/swig/mforms.i -@@ -3,6 +3,7 @@ - #pragma SWIG nowarn=401,402,509 - - %{ -+#include - #include - #include - #include -diff --git a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp b/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp -index 24db3d63..d997c410 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp -+++ b//modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp -@@ -31,6 +31,7 @@ - #include "base/string_utilities.h" - #include - #include -+#include - - using namespace grt; - using namespace base; -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp -index 3da58757..a9b082ac 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp -@@ -27,6 +27,7 @@ - - #include "mysql_sql_inserts_loader.h" - #include "mysql_sql_parser_utils.h" -+#include - #include - - using namespace grt; -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp -index 0c0f72bc..baf3d897 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp -@@ -22,6 +22,7 @@ - */ - - #include -+#include - #include - #include - -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp -index ef51d77c..68f397ae 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp -@@ -39,6 +39,7 @@ - #include "base/string_utilities.h" - #include - #include -+#include - #include - - using namespace grt; -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h -index 9e790dfb..2addd87e 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h -@@ -30,6 +30,8 @@ - - #include "base/string_utilities.h" - -+#include -+ - using namespace grt; - - template -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp -index 617487b5..9614ad9c 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp -@@ -22,6 +22,7 @@ - */ - - #include -+#include - #include - - #include "mysql_sql_schema_rename.h" -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp -index bbbb733a..51c3215d 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp -@@ -28,6 +28,7 @@ - #include "mysql_sql_parser_fe.h" - #include "grtdb/charset_utils.h" - #include "base/string_utilities.h" -+#include - #include - #include - -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp -index b87535a0..3900b7a8 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp -@@ -29,6 +29,7 @@ - #include "mysql_sql_parser_fe.h" - #include "base/string_utilities.h" - #include -+#include - #include - - using namespace grt; -diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp -index 0f9f80ad..1cb5f78a 100644 ---- a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp -+++ b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp -@@ -28,6 +28,7 @@ - #include "mysql_sql_parser_fe.h" - #include "grtdb/charset_utils.h" - #include "base/string_utilities.h" -+#include - #include - - using namespace grt; -- cgit v1.2.3