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 320B1138359 for ; Sat, 18 Jul 2020 22:25:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6231CE0942; Sat, 18 Jul 2020 22:25:03 +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 31AEFE0942 for ; Sat, 18 Jul 2020 22:25:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0948C34F3D0 for ; Sat, 18 Jul 2020 22:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1E7929A for ; Sat, 18 Jul 2020 22:25:00 +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: <1595111088.ebf74da77d3d4642fdbce64e806b2585c965da39.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch kde-misc/tellico/tellico-3.3.1.ebuild X-VCS-Directories: kde-misc/tellico/ kde-misc/tellico/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ebf74da77d3d4642fdbce64e806b2585c965da39 X-VCS-Branch: master Date: Sat, 18 Jul 2020 22:25:00 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e34d1ce-c93e-411c-b58b-47ec8332393a X-Archives-Hash: ce7fd590dba675ae20ba93a70b7a8e1e commit: ebf74da77d3d4642fdbce64e806b2585c965da39 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 18 21:58:29 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 18 22:24:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf74da7 kde-misc/tellico: Prioritise local copy of FindTaglib.cmake Fixes build with ECM 5.72 which ships a newer incompatible version. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/tellico-3.3.1-kf-5.72-findtaglib.patch | 28 ++++++++++++++++++++++ kde-misc/tellico/tellico-3.3.1.ebuild | 2 ++ 2 files changed, 30 insertions(+) diff --git a/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch new file mode 100644 index 00000000000..5d77a9816ba --- /dev/null +++ b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch @@ -0,0 +1,28 @@ +From 1051b34db65a45a4fd5f12cad0eebc27325a2be3 Mon Sep 17 00:00:00 2001 +From: Jonathan Riddell +Date: Fri, 19 Jun 2020 15:35:08 +0100 +Subject: [PATCH] switch order of cmake modules so it gives priority to the + local copy which will be the one it expects. fixes build failure on KDE neon + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 00ee0035..5b96f25b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,8 @@ endif(POLICY CMP0063) + set(CMAKE_INCLUDE_CURRENT_DIR TRUE) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} +- ${ECM_MODULE_PATH} +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ++ ${ECM_MODULE_PATH}) + + #include(ECMAddTests) + #include(ECMMarkNonGuiExecutable) +-- +GitLab + diff --git a/kde-misc/tellico/tellico-3.3.1.ebuild b/kde-misc/tellico/tellico-3.3.1.ebuild index f39a4200a14..28dc136aec5 100644 --- a/kde-misc/tellico/tellico-3.3.1.ebuild +++ b/kde-misc/tellico/tellico-3.3.1.ebuild @@ -71,6 +71,8 @@ DEPEND="${RDEPEND}" # tests need network access RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" ) + src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON