Accepting request 820417 from home:wolfi323:branches:KDE:Extra
- Add switch-order-of-cmake-modules.patch to fix build with KDE Frameworks 5.72.0 OBS-URL: https://build.opensuse.org/request/show/820417 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/tellico?expand=0&rev=61
This commit is contained in:
parent
c04fe4c734
commit
2016dbeb37
28
switch-order-of-cmake-modules.patch
Normal file
28
switch-order-of-cmake-modules.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From d8cc345fe152abeafc0c340e47c84576ac42f0cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonathan Riddell <jr@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
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jul 11 13:53:46 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
|
||||||
|
- 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 <wbauer@tmo.at>
|
Tue Jun 2 15:41:28 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
|
||||||
|
@ -26,6 +26,8 @@ URL: https://tellico-project.org/
|
|||||||
Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz
|
Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch0: Fix-compilation-with-Qt-5.9.patch
|
Patch0: Fix-compilation-with-Qt-5.9.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch1: switch-order-of-cmake-modules.patch
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: libcdio-devel
|
BuildRequires: libcdio-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user