Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/
Date: Sat, 17 Feb 2018 19:17:13
Message-Id: 1518894966.79de2de023843ad9849d7c070065c2127e18da8a.asturm@gentoo
1 commit: 79de2de023843ad9849d7c070065c2127e18da8a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 17 17:16:31 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 17 19:16:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79de2de0
7
8 media-sound/clementine: Fix lastfm paths
9
10 Unfortunately clementine relies on downstream paths.
11
12 Closes: https://bugs.gentoo.org/645638
13 Package-Manager: Portage-2.3.24, Repoman-2.3.6
14
15 media-sound/clementine/clementine-1.3.1_p20180203.ebuild | 8 ++++++++
16 media-sound/clementine/clementine-9999.ebuild | 8 ++++++++
17 2 files changed, 16 insertions(+)
18
19 diff --git a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild
20 index 8a8acf0c01c..91cb135683f 100644
21 --- a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild
22 +++ b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild
23 @@ -117,6 +117,14 @@ src_prepare() {
24 sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
25 cmake_comment_add_subdirectory tests
26 fi
27 +
28 + # Fix clementine relying on downstream renaming of lastfm header dir
29 + sed -i -e "/^#include/s/lastfm5/lastfm/" \
30 + tests/albumcoverfetcher_test.cpp \
31 + src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
32 + src/core/song.cpp || die "Failed to sed lastfm header suffix"
33 + sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
34 + -i CMakeLists.txt || die "Failed to sed lastfm header suffix"
35 }
36
37 src_configure() {
38
39 diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
40 index caae648812d..43167c9035a 100644
41 --- a/media-sound/clementine/clementine-9999.ebuild
42 +++ b/media-sound/clementine/clementine-9999.ebuild
43 @@ -117,6 +117,14 @@ src_prepare() {
44 sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
45 cmake_comment_add_subdirectory tests
46 fi
47 +
48 + # Fix clementine relying on downstream renaming of lastfm header dir
49 + sed -i -e "/^#include/s/lastfm5/lastfm/" \
50 + tests/albumcoverfetcher_test.cpp \
51 + src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
52 + src/core/song.cpp || die "Failed to sed lastfm header suffix"
53 + sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
54 + -i CMakeLists.txt || die "Failed to sed lastfm header suffix"
55 }
56
57 src_configure() {