Hello community, here is the log from the commit of package tellico for openSUSE:Factory checked in at 2020-07-14 07:55:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tellico (Old) and /work/SRC/openSUSE:Factory/.tellico.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tellico" Tue Jul 14 07:55:41 2020 rev:84 rq:820421 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tellico/tellico.changes 2020-06-03 20:34:00.037450600 +0200 +++ /work/SRC/openSUSE:Factory/.tellico.new.3060/tellico.changes 2020-07-14 07:58:23.953616657 +0200 @@ -1,0 +2,6 @@ +Sat Jul 11 13:53:46 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- Add switch-order-of-cmake-modules.patch to fix build with KDE + Frameworks 5.72.0 + +------------------------------------------------------------------- New: ---- switch-order-of-cmake-modules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tellico.spec ++++++ --- /var/tmp/diff_new_pack.BmctOs/_old 2020-07-14 07:58:24.773619312 +0200 +++ /var/tmp/diff_new_pack.BmctOs/_new 2020-07-14 07:58:24.777619325 +0200 @@ -26,6 +26,8 @@ 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 ++++++ switch-order-of-cmake-modules.patch ++++++ >From d8cc345fe152abeafc0c340e47c84576ac42f0cb Mon Sep 17 00:00:00 2001 From: Jonathan Riddell <j...@jriddell.org> 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
