| 1 |
commit: c3876a84c08510d2351ee41d189e58f2592b8c77 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 11:44:53 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 12:52:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3876a84 |
| 7 |
|
| 8 |
sci-visualization/kst: Fix build w/ >=dev-util/cmake-3.20 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/778560 |
| 11 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../kst/files/kst-2.0.8-cmake-3.20.patch | 32 ++++++++++++++++++++++ |
| 15 |
sci-visualization/kst/kst-2.0.8-r1.ebuild | 1 + |
| 16 |
2 files changed, 33 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..39e2df7d0a6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch |
| 23 |
@@ -0,0 +1,32 @@ |
| 24 |
+From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Adriaan de Groot <groot@×××.org> |
| 26 |
+Date: Sat, 3 Apr 2021 00:47:52 +0200 |
| 27 |
+Subject: [PATCH] Fix CMake-time with CMake 3.20 |
| 28 |
+ |
| 29 |
+Having multiple else-blocks for a single if() is now a syntax |
| 30 |
+error; they need to be elseif() with only a single |
| 31 |
+optional else() at the end. |
| 32 |
+--- |
| 33 |
+ CMakeLists.txt | 4 ++-- |
| 34 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 37 |
+index 593dcb11..f965bd64 100644 |
| 38 |
+--- a/CMakeLists.txt |
| 39 |
++++ b/CMakeLists.txt |
| 40 |
+@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download) |
| 41 |
+ elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) |
| 42 |
+ set(ver 4.7) |
| 43 |
+ set(md5 de6e8dbab1bb17eee6057941fddc93e3) |
| 44 |
+- else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) |
| 45 |
++ elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) |
| 46 |
+ set(ver 4.6) |
| 47 |
+ set(md5 70d8670af9c21eb8fb466654c95d8e4d) |
| 48 |
+- else(GCC_VERSION VERSION_GREATER 4.4) |
| 49 |
++ elseif(GCC_VERSION VERSION_GREATER 4.4) |
| 50 |
+ set(ver 4.4) |
| 51 |
+ set(md5 999248fb40a44543af4dd4cd1be0ceeb) |
| 52 |
+ else() |
| 53 |
+-- |
| 54 |
+GitLab |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild |
| 58 |
index e7319cac830..dea0db42382 100644 |
| 59 |
--- a/sci-visualization/kst/kst-2.0.8-r1.ebuild |
| 60 |
+++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild |
| 61 |
@@ -44,6 +44,7 @@ PATCHES=( |
| 62 |
"${FILESDIR}/${P}-includes.patch" |
| 63 |
"${FILESDIR}/${P}-qt-5.11.patch" |
| 64 |
"${FILESDIR}/${P}-gsl-2.0.patch" |
| 65 |
+ "${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560 |
| 66 |
) |
| 67 |
|
| 68 |
src_configure() { |
Archives