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 <[email protected]>
hanetzer · Jul 18, 2020 · ebf74da · ebf74da
1 parent aedfd31
commit ebf74da
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
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
@@ -0,0 +1,28 @@
+From 1051b34db65a45a4fd5f12cad0eebc27325a2be3 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <[email protected]>
+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
@@ -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