commit: 4b0a8075fd9834060a509b1671ace4c7c486572d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 17:38:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 17:38:02 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b0a8075
media-sound/amarok: Depend on correct liblastfm version
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/amarok/amarok-9999.ebuild | 7 ++----
.../amarok/files/amarok-liblastfm-headers.patch | 25 ----------------------
2 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/media-sound/amarok/amarok-9999.ebuild
b/media-sound/amarok/amarok-9999.ebuild
index d573a1e07e..c7e76ed391 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -73,7 +73,7 @@ COMMONDEPEND="
dev-libs/glib:2
>=media-libs/libgpod-0.7.0[gtk]
)
- lastfm? ( media-libs/liblastfm[qt5(+)] )
+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
mtp? ( >=media-libs/libmtp-1.0.0 )
podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] )
wikipedia? ( $(add_qt_dep qtwebengine) )
@@ -87,10 +87,7 @@ RDEPEND="${COMMONDEPEND}
$(add_qt_dep qtquickcontrols2)
"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch
- "${FILESDIR}"/${PN}-liblastfm-headers.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch )
src_configure() {
local mycmakeargs=(
diff --git a/media-sound/amarok/files/amarok-liblastfm-headers.patch
b/media-sound/amarok/files/amarok-liblastfm-headers.patch
deleted file mode 100644
index 7120db0412..0000000000
--- a/media-sound/amarok/files/amarok-liblastfm-headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b331e6e7c0e34dd896e21b9d1569214a0ec0fddb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <[email protected]>
-Date: Mon, 19 Mar 2018 22:26:54 +0100
-Subject: [PATCH] Search for liblastfm header path without suffix
-
----
- cmake/modules/FindLibLastFm.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindLibLastFm.cmake
b/cmake/modules/FindLibLastFm.cmake
-index a3a065f181..ef89423c90 100644
---- a/cmake/modules/FindLibLastFm.cmake
-+++ b/cmake/modules/FindLibLastFm.cmake
-@@ -13,7 +13,7 @@ find_path(LIBLASTFM_INCLUDE_DIR NAMES global.h
- /opt/local/include
- /usr/include
- /usr/local/include
-- PATH_SUFFIXES lastfm5
-+ PATH_SUFFIXES lastfm5 lastfm
- )
-
- find_library( LIBLASTFM_LIBRARY NAMES lastfm5
---
-2.16.2
-
