diff --git a/switch-order-of-cmake-modules.patch b/switch-order-of-cmake-modules.patch new file mode 100644 index 0000000..0c93c90 --- /dev/null +++ b/switch-order-of-cmake-modules.patch @@ -0,0 +1,28 @@ +From d8cc345fe152abeafc0c340e47c84576ac42f0cb 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 af3cc83e..ee885c6a 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/tellico.changes b/tellico.changes index 15c9d6d..282a912 100644 --- a/tellico.changes +++ b/tellico.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 11 13:53:46 UTC 2020 - Wolfgang Bauer + +- Add switch-order-of-cmake-modules.patch to fix build with KDE + Frameworks 5.72.0 + ------------------------------------------------------------------- Tue Jun 2 15:41:28 UTC 2020 - Wolfgang Bauer diff --git a/tellico.spec b/tellico.spec index fc4d7b7..8ff2348 100644 --- a/tellico.spec +++ b/tellico.spec @@ -26,6 +26,8 @@ URL: https://tellico-project.org/ Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM Patch0: Fix-compilation-with-Qt-5.9.patch +# PATCH-FIX-UPSTREAM +Patch1: switch-order-of-cmake-modules.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: libcdio-devel