No qt5-devel, add cmake patch
This commit is contained in:
parent
d4ec6a9894
commit
5690ed9b1d
20
809a769.patch
Normal file
20
809a769.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
From 809a769c690d8ab6fef293e41a29c8490512866e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
|
||||||
|
Date: Sun, 10 May 2020 15:38:01 +0200
|
||||||
|
Subject: [PATCH] Try to make Travis happy
|
||||||
|
|
||||||
|
---
|
||||||
|
cmake/versions.cmake | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/cmake/versions.cmake b/cmake/versions.cmake
|
||||||
|
index 4c6c27fd9d..adf6393cc7 100644
|
||||||
|
--- a/cmake/versions.cmake
|
||||||
|
+++ b/cmake/versions.cmake
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
# Version for libraries CPP
|
||||||
|
-SET(VERSION "2.0")
|
||||||
|
+SET(VERSION "2.0.0")
|
||||||
|
STRING(REGEX MATCHALL "[0-9]" VERSION_PARTS "${VERSION}")
|
||||||
|
LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
|
||||||
|
LIST(GET VERSION_PARTS 1 VERSION_MINOR)
|
@ -15,6 +15,7 @@ Patch0: cppcheck-1.90-tinyxml.patch
|
|||||||
Patch1: cppcheck-1.89-translations.patch
|
Patch1: cppcheck-1.89-translations.patch
|
||||||
# Select python3 explicitly
|
# Select python3 explicitly
|
||||||
Patch2: cppcheck-1.88-htmlreport-python3.patch
|
Patch2: cppcheck-1.88-htmlreport-python3.patch
|
||||||
|
Patch3: https://github.com/danmar/cppcheck/commit/809a769.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
@ -24,16 +25,15 @@ BuildRequires: pandoc
|
|||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: tinyxml2-devel >= 2.1.0
|
BuildRequires: tinyxml2-devel >= 2.1.0
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
BuildRequires: qt5-qtbase-devel
|
||||||
|
BuildRequires: qt5-linguist
|
||||||
|
|
||||||
%if %{gui}
|
%if %{gui}
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
# no qt5-devel metapackage!
|
# no qt5-devel metapackage!
|
||||||
BuildRequires: qt5-qtbase-devel
|
|
||||||
BuildRequires: qt5-linguist
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake3
|
||||||
%else
|
%else
|
||||||
BuildRequires: qt5-devel
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
%endif
|
%endif
|
||||||
@ -76,6 +76,7 @@ from xml files first generated using cppcheck.
|
|||||||
%patch0 -p1 -b .tinyxml
|
%patch0 -p1 -b .tinyxml
|
||||||
%patch1 -p1 -b .translations
|
%patch1 -p1 -b .translations
|
||||||
%patch2 -p1 -b .python3
|
%patch2 -p1 -b .python3
|
||||||
|
%patch3 -p1 -b .cmake
|
||||||
# Make sure bundled tinyxml is not used
|
# Make sure bundled tinyxml is not used
|
||||||
rm -r externals/tinyxml
|
rm -r externals/tinyxml
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user