diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/kst/6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch | 29 | ||||
| -rw-r--r-- | user/kst/APKBUILD | 6 |
2 files changed, 33 insertions, 2 deletions
diff --git a/user/kst/6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch b/user/kst/6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch new file mode 100644 index 000000000..df43eb807 --- /dev/null +++ b/user/kst/6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch @@ -0,0 +1,29 @@ +From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001 +From: Adriaan de Groot <groot@kde.org> +Date: Sat, 3 Apr 2021 00:47:52 +0200 +Subject: [PATCH] Fix CMake-time with CMake 3.20 + +Having multiple else-blocks for a single if() is now a syntax +error; they need to be elseif() with only a single +optional else() at the end. +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 593dcb11..f965bd64 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,10 +116,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() diff --git a/user/kst/APKBUILD b/user/kst/APKBUILD index c47aa32e3..75ffe3afa 100644 --- a/user/kst/APKBUILD +++ b/user/kst/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kst pkgver=2.0.8 -pkgrel=0 +pkgrel=1 pkgdesc="Real-time dataset viewing and plotting tool" url="https://kst-plot.kde.org/" arch="all" @@ -14,6 +14,7 @@ langdir="/usr/share/kst/locale" source="https://downloads.sourceforge.net/project/kst/Kst%20$pkgver/Kst-$pkgver.tar.gz kst-gsl2.patch qt5.patch + 6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch " builddir="$srcdir/Kst-$pkgver" @@ -44,4 +45,5 @@ package() { sha512sums="81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb Kst-2.0.8.tar.gz 1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch -63705a561890792a1d3cced65075a46d0f507f5abf2599de6475491d7484bba3102152c8fe13a6d3c424e409e6b6070299208d09f74282137b6e95acc95df879 qt5.patch" +63705a561890792a1d3cced65075a46d0f507f5abf2599de6475491d7484bba3102152c8fe13a6d3c424e409e6b6070299208d09f74282137b6e95acc95df879 qt5.patch +a3eae1e0bdd6ef4483672113987844aae439044c879a42f4097829a331b13d419cd8ad762c7ed05391afa0127f4a433de9d75aa4293f93ff531dc36c823644c1 6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch" |