commit: d79bab5ce85c2c70d5bf742426d49aed9a4f6f10 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 15 22:02:28 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 15 22:06:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79bab5c
sci-visualization/kst: drop 2.0.8-r2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-visualization/kst/Manifest | 1 - .../kst/files/kst-2.0.8-cmake-3.20.patch | 32 --------- .../kst/files/kst-2.0.8-gsl-2.0.patch | 30 --------- .../kst/files/kst-2.0.8-includes.patch | 25 ------- .../kst/files/kst-2.0.8-qt-5.11.patch | 46 ------------- .../kst/files/kst-2.0.8-qt-5.15.patch | 10 --- sci-visualization/kst/kst-2.0.8-r2.ebuild | 77 ---------------------- 7 files changed, 221 deletions(-) diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index 8bab32da2136..6ac77b381ddd 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1,2 +1 @@ -DIST Kst-2.0.8.tar.gz 14527129 BLAKE2B 5330dc97bc56bf8c6120a461e078ed1bdf87c4ec41b6f6ddc13d7500fde0d1b973b42da8f38c738d133559696d89ad579c288206c7ba07bbfd22dbc2bf6f2064 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb DIST kst-plot-2.1.0_p20250415-16334f6f.tar.gz 18814920 BLAKE2B 4a0f609bff3e9c1bd512d04e7a4725d89cb34f0fcc606c704439281c065a5c20fc7e81272837604a858e4f91e73e6b8f0ea584591aa55fdf6ee37661e9434d4d SHA512 9a8b37c748d96bbaf878da7a9b9479387e83a1db39226867e3439e999fe9e66ec27f021194b0610759d5380ab934d6292c005500fdafd783ba9a939ce579a19c 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 deleted file mode 100644 index 39e2df7d0a64..000000000000 --- a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001 -From: Adriaan de Groot <[email protected]> -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() --- -GitLab - diff --git a/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch deleted file mode 100644 index c49ba2e20bca..000000000000 --- a/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch kindly borrowed from Debian. -Gentoo-bug: https://bugs.gentoo.org/574746 -KDE-bug: https://bugs.kde.org/show_bug.cgi?id=355324 - ---- a/src/plugins/fits/non_linear.h -+++ b/src/plugins/fits/non_linear.h -@@ -177,7 +177,9 @@ bool kstfit_nonlinear( - } - iIterations++; - } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); -- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); -+ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); -+ gsl_multifit_fdfsolver_jac (pSolver, J); -+ gsl_multifit_covar (J, 0.0, pMatrixCovariance); - - // - // determine the fitted values... ---- a/src/plugins/fits/non_linear_weighted.h -+++ b/src/plugins/fits/non_linear_weighted.h -@@ -193,7 +193,9 @@ bool kstfit_nonlinear_weighted( - } - while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); - -- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); -+ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); -+ gsl_multifit_fdfsolver_jac (pSolver, J); -+ gsl_multifit_covar (J, 0.0, pMatrixCovariance); - - // - // determine the fitted values... diff --git a/sci-visualization/kst/files/kst-2.0.8-includes.patch b/sci-visualization/kst/files/kst-2.0.8-includes.patch deleted file mode 100644 index 113d9dcc807d..000000000000 --- a/sci-visualization/kst/files/kst-2.0.8-includes.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add missing includes required for Qt 5 build to succeed. - -Author: David Carne <[email protected]> -Gentoo-bug: 587948 - ---- a/src/libkst/editablematrix.cpp -+++ b/src/libkst/editablematrix.cpp -@@ -19,6 +19,7 @@ - #include "debug.h" - #include <qbytearray.h> - #include <QXmlStreamWriter> -+#include <QDataStream> - - namespace Kst { - ---- a/src/libkst/editablevector.cpp -+++ b/src/libkst/editablevector.cpp -@@ -18,6 +18,7 @@ - // Create QDataStream into a QByteArray - // qCompress the bytearray - #include <QXmlStreamWriter> -+#include <QDataStream> - - #include "debug.h" - namespace Kst { diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch deleted file mode 100644 index 8409f6664d73..000000000000 --- a/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux <[email protected]> -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 v0.11.2 diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch deleted file mode 100644 index 97b42a6d33c2..000000000000 --- a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/widgets/gradienteditor.h 2014-02-13 09:41:44.000000000 +0000 -+++ b/src/widgets/gradienteditor.h 2021-04-18 14:45:24.654148450 +0100 -@@ -16,6 +16,7 @@ - #include <QHash> - #include <QWidget> - #include <QGradient> -+#include <QPainterPath> - - #include "kstwidgets_export.h" - diff --git a/sci-visualization/kst/kst-2.0.8-r2.ebuild b/sci-visualization/kst/kst-2.0.8-r2.ebuild deleted file mode 100644 index 5cb76ab292a8..000000000000 --- a/sci-visualization/kst/kst-2.0.8-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P=Kst-${PV} -inherit cmake flag-o-matic xdg-utils - -DESCRIPTION="Fast real-time large-dataset viewing and plotting tool" -HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"; -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2 LGPL-2 FDL-1.2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug test" - -RESTRICT="test" - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sci-libs/cfitsio:= - sci-libs/getdata[cxx] - sci-libs/gsl:= - sci-libs/matio:= - sci-libs/netcdf-cxx:3 -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND="dev-qt/linguist-tools:5" - -DOCS=( AUTHORS README.kstScript ) - -PATCHES=( - "${FILESDIR}/${P}-includes.patch" - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-gsl-2.0.patch" - "${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560 - "${FILESDIR}/${P}-getdata-drop-bogus-lib_debug.patch" # bug 593848 - "${FILESDIR}/${P}-qt-5.15.patch" # bug 593848 -) - -src_configure() { - # -Werror=odr, -Werror=lto-type=-mismatch - # https://bugs.gentoo.org/863296 - # https://bugs.kde.org/show_bug.cgi?id=484572 - filter-lto - - local mycmakeargs=( - -Dkst_install_libdir="$(get_libdir)" - -Dkst_pch=OFF - -Dkst_qt5=ON - -Dkst_release=$(usex debug OFF ON) - -Dkst_rpath=OFF - -Dkst_svnversion=OFF - -Dkst_test=$(usex test) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -}
