| 1 |
commit: 6615126d2da5b99b1fd8dff7832114cbf1f2dc25 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 4 20:00:55 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 20:06:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6615126d |
| 7 |
|
| 8 |
media-sound/amarok: Fix rpath on mysqld |
| 9 |
|
| 10 |
Patch rebased for current version by Peter Levine |
| 11 |
<plevine457 <AT> gmail.com>, was unfortunately dropped in kde overlay for |
| 12 |
version bump. |
| 13 |
|
| 14 |
Gentoo-bug: 581554 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.28 |
| 17 |
|
| 18 |
.../amarok/{amarok-2.8.90.ebuild => amarok-2.8.90-r1.ebuild} | 4 ++++ |
| 19 |
media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++++++++++++ |
| 20 |
2 files changed, 16 insertions(+) |
| 21 |
|
| 22 |
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90-r1.ebuild |
| 23 |
similarity index 94% |
| 24 |
rename from media-sound/amarok/amarok-2.8.90.ebuild |
| 25 |
rename to media-sound/amarok/amarok-2.8.90-r1.ebuild |
| 26 |
index 4db4e97..3012de2 100644 |
| 27 |
--- a/media-sound/amarok/amarok-2.8.90.ebuild |
| 28 |
+++ b/media-sound/amarok/amarok-2.8.90-r1.ebuild |
| 29 |
@@ -75,6 +75,7 @@ RDEPEND="${COMMONDEPEND} |
| 30 |
PATCHES=( |
| 31 |
"${FILESDIR}/${PN}-2.8.0-taglib110.patch" |
| 32 |
"${FILESDIR}/${P}-mysql-embedded.patch" |
| 33 |
+ "${FILESDIR}/${P}-mysqld-rpath.patch" |
| 34 |
) |
| 35 |
|
| 36 |
src_configure() { |
| 37 |
@@ -97,6 +98,9 @@ src_configure() { |
| 38 |
-DWITH_UTILITIES=$(usex utils) |
| 39 |
) |
| 40 |
|
| 41 |
+ # bug 581554: add libmysqld location for rpath patch |
| 42 |
+ use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) |
| 43 |
+ |
| 44 |
kde4-base_src_configure |
| 45 |
} |
| 46 |
|
| 47 |
|
| 48 |
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 |
| 49 |
new file mode 100644 |
| 50 |
index 0000000..c84975d |
| 51 |
--- /dev/null |
| 52 |
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch |
| 53 |
@@ -0,0 +1,12 @@ |
| 54 |
+--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old 2016-05-04 11:01:25.000000000 -0400 |
| 55 |
++++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04 11:05:24.216625165 -0400 |
| 56 |
+@@ -28,6 +28,9 @@ |
| 57 |
+ ${ZLIB_LIBRARIES} |
| 58 |
+ ) |
| 59 |
+ |
| 60 |
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) |
| 61 |
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}") |
| 62 |
++ |
| 63 |
+ if(NOT WIN32 AND NOT APPLE) |
| 64 |
+ target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread ) |
| 65 |
+ endif(NOT WIN32 AND NOT APPLE) |
Archives