diff options
Diffstat (limited to 'user/kst')
| -rw-r--r-- | user/kst/6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch | 29 | ||||
| -rw-r--r-- | user/kst/APKBUILD | 16 | ||||
| -rw-r--r-- | user/kst/qt5.patch | 47 |
3 files changed, 85 insertions, 7 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 d87b6e693..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" @@ -12,11 +12,13 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev gsl-dev" subpackages="$pkgname-doc $pkgname-lang" langdir="/usr/share/kst/locale" source="https://downloads.sourceforge.net/project/kst/Kst%20$pkgver/Kst-$pkgver.tar.gz - kst-gsl2.patch" + kst-gsl2.patch + qt5.patch + 6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch + " builddir="$srcdir/Kst-$pkgver" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,19 +31,19 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -Dkst_qt5="YesPlease" \ -Dkst_install_prefix="/usr" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb Kst-2.0.8.tar.gz -1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch" +1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch +63705a561890792a1d3cced65075a46d0f507f5abf2599de6475491d7484bba3102152c8fe13a6d3c424e409e6b6070299208d09f74282137b6e95acc95df879 qt5.patch +a3eae1e0bdd6ef4483672113987844aae439044c879a42f4097829a331b13d419cd8ad762c7ed05391afa0127f4a433de9d75aa4293f93ff531dc36c823644c1 6a41644c39ffb394c350de3dacbacdffa54a0a2a-fix-cmake.patch" diff --git a/user/kst/qt5.patch b/user/kst/qt5.patch new file mode 100644 index 000000000..64c5d3c40 --- /dev/null +++ b/user/kst/qt5.patch @@ -0,0 +1,47 @@ +From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <christophe@krop.fr> +Date: Sun, 3 Jun 2018 19:43:34 +0200 +Subject: Fix build with Qt 5.11 + +Summary: +- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead. +- Add a missing #include + +Subscribers: kde-edu + +Tags: #kde_edu + +Differential Revision: https://phabricator.kde.org/D13339 +--- + cmake/modules/KstMacros.cmake | 2 +- + src/libkstapp/view.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +index 4ff9c15..bc3d8a6 100644 +--- a/cmake/modules/KstMacros.cmake ++++ b/cmake/modules/KstMacros.cmake +@@ -240,7 +240,7 @@ endmacro() + macro(kst_link) + target_link_libraries(${kst_name} ${ARGV}) + if(kst_qt5) +- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) ++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) + else() + target_link_libraries(${kst_name} + ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h +index 95c8c6a..2af5393 100644 +--- a/src/libkstapp/view.h ++++ b/src/libkstapp/view.h +@@ -14,6 +14,7 @@ + #define VIEW_H + + #include <QGraphicsView> ++#include <QMenu> + + #include "kst_export.h" + +-- +cgit v1.1 + |