commit: 6615126d2da5b99b1fd8dff7832114cbf1f2dc25
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 20:00:55 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:06:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6615126d
media-sound/amarok: Fix rpath on mysqld
Patch rebased for current version by Peter Levine
<plevine457 <AT> gmail.com>, was unfortunately dropped in kde overlay for
version bump.
Gentoo-bug: 581554
Package-Manager: portage-2.2.28
.../amarok/{amarok-2.8.90.ebuild => amarok-2.8.90-r1.ebuild} | 4 ++++
media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild
b/media-sound/amarok/amarok-2.8.90-r1.ebuild
similarity index 94%
rename from media-sound/amarok/amarok-2.8.90.ebuild
rename to media-sound/amarok/amarok-2.8.90-r1.ebuild
index 4db4e97..3012de2 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r1.ebuild
@@ -75,6 +75,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
"${FILESDIR}/${P}-mysql-embedded.patch"
+ "${FILESDIR}/${P}-mysqld-rpath.patch"
)
src_configure() {
@@ -97,6 +98,9 @@ src_configure() {
-DWITH_UTILITIES=$(usex utils)
)
+ # bug 581554: add libmysqld location for rpath patch
+ use embedded && mycmakeargs+=(
-DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
kde4-base_src_configure
}
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
new file mode 100644
index 0000000..c84975d
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old
2016-05-04 11:01:25.000000000 -0400
++++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04
11:05:24.216625165 -0400
+@@ -28,6 +28,9 @@
+ ${ZLIB_LIBRARIES}
+ )
+
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES
BUILD_WITH_INSTALL_RPATH TRUE)
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH
"${MYSQLD_DIR}")
++
+ if(NOT WIN32 AND NOT APPLE)
+ target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
