From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC59E139083 for ; Thu, 14 Dec 2017 08:10:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD510E0F29; Thu, 14 Dec 2017 08:10:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8766BE0F29 for ; Thu, 14 Dec 2017 08:10:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B8AE33BF3C for ; Thu, 14 Dec 2017 08:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B5D5AE1D for ; Thu, 14 Dec 2017 08:10:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1513238931.e7433606134f4cc3a5d2d3216d77bc2ec209a908.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/, media-sound/amarok/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-sound/amarok/amarok-9999.ebuild media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch X-VCS-Directories: media-sound/amarok/ media-sound/amarok/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e7433606134f4cc3a5d2d3216d77bc2ec209a908 X-VCS-Branch: master Date: Thu, 14 Dec 2017 08:10:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4319ab24-a9ee-4de1-a038-f6b0c96e791b X-Archives-Hash: dae40a4f8cacff8402e033ec5e4bc06b commit: e7433606134f4cc3a5d2d3216d77bc2ec209a908 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 14 08:08:17 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 14 08:08:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7433606 media-sound/amarok: Add mysqld-rpath fix Package-Manager: Portage-2.3.13, Repoman-2.3.4 media-sound/amarok/amarok-9999.ebuild | 9 +++++++-- media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index d871c0fa3d..eeb786a499 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -90,6 +90,8 @@ RDEPEND="${COMMONDEPEND} !media-sound/amarok:4 " +PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch ) + src_configure() { # Append minimal-toc cflag for ppc64, see bug 280552 and 292707 # use ppc64 && append-flags -mminimal-toc @@ -98,17 +100,20 @@ src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON -DWITH_MP3Tunes=OFF -DWITH_PLAYER=ON - -DWITH_SPECTRUM_ANALYZER=OFF -DWITH_MYSQL_EMBEDDED=$(usex embedded) $(cmake-utils_use_find_package ffmpeg FFmpeg) -DWITH_IPOD=$(usex ipod) - $(cmake-utils_use_find_package ipod GDKPixBuf) $(cmake-utils_use_find_package lastfm LibLastFm) $(cmake-utils_use_find_package mtp Mtp) $(cmake-utils_use_find_package ofa LibOFA) -DWITH_UTILITIES=$(usex utils) ) + use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON ) + + # bug 581554: add libmysqld location for rpath patch + use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) + kde5_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 0000000000..08db5bbe37 --- /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 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)