diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2014-07-12 09:12:24 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2014-07-12 09:12:24 +0000 |
| commit | 7a49c1643f6717ebe1d7c228e97fb6ef5a533cba (patch) | |
| tree | f14775de833eca125e4d09c401f2898c504b31fd /dev-db | |
| parent | Cleanup (diff) | |
| download | gentoo-2-7a49c1643f6717ebe1d7c228e97fb6ef5a533cba.tar.gz gentoo-2-7a49c1643f6717ebe1d7c228e97fb6ef5a533cba.tar.bz2 gentoo-2-7a49c1643f6717ebe1d7c228e97fb6ef5a533cba.zip | |
Fix wbcopytables RPATH. Thanks to Tom Hope for providing a patch in bug 516376.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql-workbench/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch | 10 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 0f053e98cf60..53c27f5d5bf5 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/mysql-workbench # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.95 2014/07/12 06:45:30 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.96 2014/07/12 09:12:24 graaff Exp $ + + 12 Jul 2014; Hans de Graaff <graaff@gentoo.org> mysql-workbench-6.1.7.ebuild, + +files/mysql-workbench-6.1.7-wbcopytables.patch: + Fix wbcopytables RPATH. Thanks to Tom Hope for providing a patch in bug + 516376. 12 Jul 2014; Hans de Graaff <graaff@gentoo.org> -mysql-workbench-6.0.8.ebuild, -mysql-workbench-6.1.4.ebuild: diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch new file mode 100644 index 000000000000..7f4013a2ecf3 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch @@ -0,0 +1,10 @@ +--- plugins/migration/CMakeLists.txt.~1~ 2014-07-12 08:45:56.808929549 +0200 ++++ plugins/migration/CMakeLists.txt 2014-07-12 08:49:26.659049880 +0200 +@@ -7,6 +7,7 @@ + + add_definitions(${ODBC_DEFINITIONS}) + ++SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}") + add_executable(wbcopytables + copytable/copytable.cpp + copytable/python_copy_data_source.cpp diff --git a/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild index f2066d32359b..f234b248c129 100644 --- a/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild,v 1.1 2014/06/30 17:59:00 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild,v 1.2 2014/07/12 09:12:24 graaff Exp $ EAPI=5 GCONF_DEBUG="no" @@ -66,7 +66,8 @@ S="${WORKDIR}"/"${MY_P}" src_prepare() { ## Patch CMakeLists.txt - epatch "${FILESDIR}/${PN}-6.0.8-CMakeLists.patch" + epatch "${FILESDIR}/${PN}-6.0.8-CMakeLists.patch" \ + "${FILESDIR}/${P}-wbcopytables.patch" ## remove hardcoded CXXFLAGS sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |