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 067BE1382C5 for ; Sat, 17 Feb 2018 19:17:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42DC0E0A89; Sat, 17 Feb 2018 19:17:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1ECB3E0A89 for ; Sat, 17 Feb 2018 19:17:12 +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 CB2A7335C2A for ; Sat, 17 Feb 2018 19:17:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0357B22D for ; Sat, 17 Feb 2018 19:17:07 +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: <1518894966.79de2de023843ad9849d7c070065c2127e18da8a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-1.3.1_p20180203.ebuild media-sound/clementine/clementine-9999.ebuild X-VCS-Directories: media-sound/clementine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 79de2de023843ad9849d7c070065c2127e18da8a X-VCS-Branch: master Date: Sat, 17 Feb 2018 19:17:07 +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: 303a5e4d-c144-4447-86ae-1ceea0313d44 X-Archives-Hash: 50b7fd23c61a34d01d7f10904c7a3c07 commit: 79de2de023843ad9849d7c070065c2127e18da8a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 17 17:16:31 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 17 19:16:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79de2de0 media-sound/clementine: Fix lastfm paths Unfortunately clementine relies on downstream paths. Closes: https://bugs.gentoo.org/645638 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/clementine/clementine-1.3.1_p20180203.ebuild | 8 ++++++++ media-sound/clementine/clementine-9999.ebuild | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild index 8a8acf0c01c..91cb135683f 100644 --- a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild @@ -117,6 +117,14 @@ src_prepare() { sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die cmake_comment_add_subdirectory tests fi + + # Fix clementine relying on downstream renaming of lastfm header dir + sed -i -e "/^#include/s/lastfm5/lastfm/" \ + tests/albumcoverfetcher_test.cpp \ + src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \ + src/core/song.cpp || die "Failed to sed lastfm header suffix" + sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \ + -i CMakeLists.txt || die "Failed to sed lastfm header suffix" } src_configure() { diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index caae648812d..43167c9035a 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -117,6 +117,14 @@ src_prepare() { sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die cmake_comment_add_subdirectory tests fi + + # Fix clementine relying on downstream renaming of lastfm header dir + sed -i -e "/^#include/s/lastfm5/lastfm/" \ + tests/albumcoverfetcher_test.cpp \ + src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \ + src/core/song.cpp || die "Failed to sed lastfm header suffix" + sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \ + -i CMakeLists.txt || die "Failed to sed lastfm header suffix" } src_configure() {