dev-db/mysql-workbench: fix building against mysql-connector-c++-8

Thanks to fedeliallalinea for providing a patch and Marco Genasci for
linking it to the bug.

Closes: https://bugs.gentoo.org/702666
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Hans de Graaff <graaff@gentoo.org>

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
new file mode 100644 (file)
index 0000000..c624dea
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
@@ -0,0 +1,12 @@
+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/mysql-workbench-8.0.19.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
index faddecba8cf4ce3d91c6e30a5d1550b945b21a72..4303dbc9863df7fad62df02ffcf4cac14349965d 100644 (file)
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
@@ -70,6 +70,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+       "${FILESDIR}/${P}-mysql-connector-8.patch"
 )
 
 src_unpack() {