This commit is contained in:
parent
acf8290ca2
commit
6105352d98
29
0001-Fix-build-with-CMake-3.20.patch
Normal file
29
0001-Fix-build-with-CMake-3.20.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From c1b7769c37c70d189d09d8dc104d0541433b58b6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
Date: Wed, 12 May 2021 07:27:48 +0200
|
||||||
|
Subject: [PATCH] Fix build with CMake 3.20
|
||||||
|
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index dfb3bf8..b7c75f0 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -112,10 +112,10 @@ elseif(kst_3rdparty_download)
|
||||||
|
elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
|
||||||
|
set(ver 4.7)
|
||||||
|
set(md5 de6e8dbab1bb17eee6057941fddc93e3)
|
||||||
|
- else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
|
||||||
|
+ elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
|
||||||
|
set(ver 4.6)
|
||||||
|
set(md5 70d8670af9c21eb8fb466654c95d8e4d)
|
||||||
|
- else(GCC_VERSION VERSION_GREATER 4.4)
|
||||||
|
+ elseif(GCC_VERSION VERSION_GREATER 4.4)
|
||||||
|
set(ver 4.4)
|
||||||
|
set(md5 999248fb40a44543af4dd4cd1be0ceeb)
|
||||||
|
else()
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 12 05:29:54 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add patch to fix build with CMake 3.20:
|
||||||
|
* 0001-Fix-build-with-CMake-3.20.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jul 21 07:34:52 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
|
Tue Jul 21 07:34:52 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
|
||||||
|
|
||||||
|
6
kst.spec
6
kst.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package kst
|
# spec file for package kst
|
||||||
#
|
#
|
||||||
# Copyright (c) 2020 SUSE LLC
|
# Copyright (c) 2021 SUSE LLC
|
||||||
# Copyright (c) 2011 Christian Trippe ctrippe@opensuse.org
|
# Copyright (c) 2011 Christian Trippe ctrippe@opensuse.org
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -29,6 +29,8 @@ Source: Kst-%{version}.tar.gz
|
|||||||
Patch0: gsl2-support.patch
|
Patch0: gsl2-support.patch
|
||||||
# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -- Fixes build with Qt 5.11
|
# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -- Fixes build with Qt 5.11
|
||||||
Patch1: Fix-build-with-Qt-511.patch
|
Patch1: Fix-build-with-Qt-511.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch2: 0001-Fix-build-with-CMake-3.20.patch
|
||||||
BuildRequires: Mesa-devel
|
BuildRequires: Mesa-devel
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -93,7 +95,7 @@ EXTRA_FLAGS="-Dkst_install_prefix=%{_prefix} \
|
|||||||
-Dkst_qt5=1"
|
-Dkst_qt5=1"
|
||||||
|
|
||||||
%cmake $EXTRA_FLAGS
|
%cmake $EXTRA_FLAGS
|
||||||
make %{?_smp_mflags}
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
Loading…
Reference in New Issue
Block a user