[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

[Hans de Graaff]

commit:     8a4458a2e1bdcdfc32943616647fa5264575ea18
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 04:35:47 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon May 29 04:35:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4458a2

dev-db/mysql-workbench: backport gtk patch also to stable version

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 94025dc46bc..1d3b557c13c 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -39,7 +39,7 @@ CDEPEND="${PYTHON_DEPS}
                >=dev-libs/libxml2-2.6.2:2
                dev-libs/libzip
                >=virtual/mysql-5.1
-               dev-libs/libpcre
+               dev-libs/libpcre[cxx]
                >=sci-libs/gdal-1.11.1-r1[-mdb]
                virtual/opengl
                >=dev-lang/lua-5.1:0[deprecated]
@@ -75,7 +75,8 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
                "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
                "${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-               "${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+               "${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
+               "${FILESDIR}/${PN}-6.3.4-gtk.patch"
 
        sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
                modules/db.mysql.sqlparser/CMakeLists.txt