1 |
commit: e997d6b79ac1d6f0839b6d38428d03a6ff2bcba4 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 10:33:10 2020 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 10:33:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e997d6b7 |
7 |
|
8 |
dev-db/mysql-workbench: fix building against mysql-connector-c++-8 |
9 |
|
10 |
Thanks to fedeliallalinea for providing a patch and Marco Genasci for |
11 |
linking it to the bug. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/702666 |
14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
15 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
16 |
|
17 |
.../files/mysql-workbench-8.0.19-mysql-connector-8.patch | 12 ++++++++++++ |
18 |
dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild | 1 + |
19 |
2 files changed, 13 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..c624dea0e56 |
24 |
--- /dev/null |
25 |
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch |
26 |
@@ -0,0 +1,12 @@ |
27 |
+diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake b/build/cmake/Modules/FindMySQLCppConn.cmake |
28 |
+--- a/build/cmake/Modules/FindMySQLCppConn.cmake 2019-12-18 13:31:34.520496484 +0100 |
29 |
++++ b/build/cmake/Modules/FindMySQLCppConn.cmake 2019-12-18 13:32:32.590496631 +0100 |
30 |
+@@ -27,7 +27,7 @@ |
31 |
+ set(MySQLCppConn_FIND_QUIETLY TRUE) |
32 |
+ endif () |
33 |
+ |
34 |
+-find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include /usr/local/include) |
35 |
++find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc) |
36 |
+ |
37 |
+ SET(MySQLCppConn_NAMES mysqlcppconn) |
38 |
+ |
39 |
|
40 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild |
41 |
index faddecba8cf..4303dbc9863 100644 |
42 |
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild |
43 |
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild |
44 |
@@ -70,6 +70,7 @@ S="${WORKDIR}"/"${MY_P}" |
45 |
|
46 |
PATCHES=( |
47 |
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
48 |
+ "${FILESDIR}/${P}-mysql-connector-8.patch" |
49 |
) |
50 |
|
51 |
src_unpack() { |