commit: 13b7d2e0446512c2d62e2cfb517aa47dbe7ab351 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 30 15:08:24 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Aug 30 16:15:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b7d2e0
sci-visualization/kst: drop 2.1.0_p20250415-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-visualization/kst/Manifest | 1 - .../files/kst-2.1.0_p20250415-cmake-findgsl.patch | 47 ------------ .../files/kst-2.1.0_p20250415-cmake-findhdf5.patch | 43 ----------- .../kst/files/kst-2.1.0_p20250415-cmake4.patch | 83 --------------------- .../kst/files/kst-2.1.0_p20250415-hdf5cxx.patch | 20 ------ .../kst/kst-2.1.0_p20250415-r1.ebuild | 84 ---------------------- 6 files changed, 278 deletions(-) diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index aae93bd695f5..2e41b364b13d 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1,2 +1 @@ -DIST kst-plot-2.1.0_p20250415-16334f6f.tar.gz 18814920 BLAKE2B 4a0f609bff3e9c1bd512d04e7a4725d89cb34f0fcc606c704439281c065a5c20fc7e81272837604a858e4f91e73e6b8f0ea584591aa55fdf6ee37661e9434d4d SHA512 9a8b37c748d96bbaf878da7a9b9479387e83a1db39226867e3439e999fe9e66ec27f021194b0610759d5380ab934d6292c005500fdafd783ba9a939ce579a19c DIST kst-plot-2.1.0_p20250830-c250288d.tar.gz 18814925 BLAKE2B 1fb5f6bec36c5baa9bd19400efc3ccd84479c6985138d1e03ccc2b21d7705b77e6dbac932303c89367044a0d014cbc562d231215c5584860ab2b926a2f78bab7 SHA512 3482d914b04fd477bbcf813761b1f6b57c787fea13cc5df5bdb62cee2172d8859f6fc831cf1cc7d650a86080807e8e66f3744d9ea7bf8d14f410af8994283f1f diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch deleted file mode 100644 index a4d59c58f5ab..000000000000 --- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findgsl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7fbe099d763f99275e89d577a462f4195966cc0e Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Tue, 15 Apr 2025 19:59:04 +0200 -Subject: [PATCH] Use CMake FindGSL module - -Fixes build if /usr/include/gsl directory is polluted by ms-gsl. - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 4 +-- - src/plugins/CMakeLists.txt | 5 ++- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4bc5239..bc84fbf0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -161,7 +161,7 @@ endif() - if(kst_3rdparty) - message(STATUS "3rd party libs for plugins--------------------") - find_package(Getdata) -- find_package(Gsl) -+ find_package(GSL) - find_package(Netcdf) - find_package(Matio) - find_package(CFITSIO) -diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt -index 6c744f97..c5929d88 100644 ---- a/src/plugins/CMakeLists.txt -+++ b/src/plugins/CMakeLists.txt -@@ -30,11 +30,10 @@ kst_add_plugin(filters window) - kst_add_plugin(filters differentiation) - kst_add_plugin(filters exponential) - --if(gsl) -- include_directories(${GSL_INCLUDE_DIR}) -+if(GSL_FOUND) - macro(kst_add_gsl_plugin dir name) - kst_add_plugin(${dir} ${name}) -- kst_link(${GSL_LIBRARIES}) -+ kst_link(GSL::gsl) - endmacro() - - kst_add_gsl_plugin(dataobject/convolution convolve) --- -2.49.0 - diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch deleted file mode 100644 index b9b9c77e1e0e..000000000000 --- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake-findhdf5.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 58ea6c63dd800ebeb9f0b12744e4de87e8d372b5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 23 Apr 2025 19:07:28 +0200 -Subject: [PATCH] Use CMake provided FindHDF5 module - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 2 +- - src/datasources/CMakeLists.txt | 6 +-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bc84fbf0..db9c09fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,7 +166,7 @@ if(kst_3rdparty) - find_package(Matio) - find_package(CFITSIO) - find_package(LibTiff) -- find_package(HDF5) -+ find_package(HDF5 COMPONENTS CXX) - message(STATUS "----------------------------------------------") - else() - message(STATUS "Building plugins depending on 3rd party libraries suppressed") -diff --git a/src/datasources/CMakeLists.txt b/src/datasources/CMakeLists.txt -index f72c44b0..12da98c8 100644 ---- a/src/datasources/CMakeLists.txt -+++ b/src/datasources/CMakeLists.txt -@@ -73,8 +73,8 @@ if(tiff) - kst_link(${TIFF_LIBRARIES}) - endif() - --if(hdf5) -- include_directories(${HDF5_INCLUDEDIR}) -+if(HDF5_FOUND) -+ include_directories(${HDF5_CXX_INCLUDE_DIRS}) - kst_add_plugin(. hdf5) -- kst_link(${HDF5_LIBRARIES}) -+ kst_link(${HDF5_CXX_LIBRARIES}) - endif() --- -2.49.0 - diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch deleted file mode 100644 index 821796fcd189..000000000000 --- a/sci-visualization/kst/files/kst-2.1.0_p20250415-cmake4.patch +++ /dev/null @@ -1,83 +0,0 @@ -https://build.opensuse.org/projects/openSUSE:Factory/packages/kst/files/kst-cmake4.patch - -From 938ba7f91685c5d4261291f0b7ab5e986edc5a3e Mon Sep 17 00:00:00 2001 -From: Christophe Marin <[email protected]> -Date: Tue, 1 Apr 2025 16:02:59 +0200 -Subject: [PATCH] Fix build with CMake 4 - ---- - CMakeLists.txt | 41 ++++++++++++++++------------------------- - 1 file changed, 16 insertions(+), 25 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4bc523..dce0253 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,19 @@ --cmake_minimum_required(VERSION 3.0.0) -+cmake_minimum_required(VERSION 3.16) -+ -+set(kst_version_major 2) -+if(kst_version_string) -+ set(kst_version ${kst_version_string}) -+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${kst_version}") -+else() -+ set(kst_version_minor 1) -+ #set(kst_version_patch x) -+ set(kst_version ${kst_version_major}.${kst_version_minor}) -+ #set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch}) -+ set(kst_version_string ${kst_version}) -+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Kst ${kst_version}") -+endif() -+ -+project(Kst VERSION ${kst_version}) - - if(kst_clang) - set(CMAKE_C_COMPILER "clang") -@@ -6,14 +21,6 @@ if(kst_clang) - message(STATUS "Using clang ${CMAKE_CXX_COMPILER}") - endif() - --if(POLICY CMP0020) -- cmake_policy(SET CMP0020 OLD) --endif() -- --if(${CMAKE_MAJOR_VERSION} EQUAL 3) -- cmake_policy(SET CMP0043 OLD) --endif() -- - # figure out if we use MinGW with Ninja: call with -DCC=gcc - if(WIN32 AND CMAKE_GENERATOR MATCHES Ninja AND CC MATCHES gcc) - find_file(mingw_make mingw32-make.exe) -@@ -69,9 +76,6 @@ if(kst_cross) - endif() - - --project(Kst) -- -- - if(kst_release) - set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_WARNING_OUTPUT") -@@ -87,19 +91,6 @@ if(kst_sanitize) - endif() - - --set(kst_version_major 2) --if(kst_version_string) -- set(kst_version ${kst_version_string}) -- set(CPACK_PACKAGE_INSTALL_DIRECTORY "${kst_version}") --else() -- set(kst_version_minor 1) -- #set(kst_version_patch x) -- set(kst_version ${kst_version_major}.${kst_version_minor}) -- #set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch}) -- set(kst_version_string ${kst_version}) -- set(CPACK_PACKAGE_INSTALL_DIRECTORY "Kst ${kst_version}") --endif() -- - if(CMAKE_COMPILER_IS_GNUCC) - execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) - message(STATUS "Using GCC version ${GCC_VERSION}") --- -2.49.0 diff --git a/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch b/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch deleted file mode 100644 index 259fa72b4f9d..000000000000 --- a/sci-visualization/kst/files/kst-2.1.0_p20250415-hdf5cxx.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://build.opensuse.org/projects/openSUSE:Factory/packages/kst/files/fix-hdf5-include-path.patch - -Subject: Fix a header path -From: Antonio Larrosa <[email protected]> - -We install H5Cpp.h in /usr/include so we need to fix the include line. - -Index: kst-plot/src/datasources/hdf5/hdf5.h -=================================================================== ---- a/src/datasources/hdf5/hdf5.h -+++ b/src/datasources/hdf5/hdf5.h -@@ -18,7 +18,7 @@ - #include <dataplugin.h> - - #include <QFileInfo> --#include <hdf5/serial/H5Cpp.h> -+#include <H5Cpp.h> - #include <exception> - - #include "debug.h" diff --git a/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild b/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild deleted file mode 100644 index f586eefa1b9b..000000000000 --- a/sci-visualization/kst/kst-2.1.0_p20250415-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindGsl FindHDF5 ) -KDE_ORG_CATEGORY=graphics -KDE_ORG_NAME=kst-plot -KDE_ORG_COMMIT=16334f6f99613a1b60873d93835f9083dca258b2 -inherit cmake flag-o-matic kde.org xdg - -DESCRIPTION="Fast real-time large-dataset viewing and plotting tool" -HOMEPAGE="https://kst-plot.kde.org/"; - -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/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/tiff:= - sci-libs/cfitsio:= - sci-libs/getdata[cxx] - sci-libs/gsl:= - sci-libs/hdf5:=[cxx] - 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}"/${PN}-2.0.8-getdata-drop-bogus-lib_debug.patch # bug #593848 - "${FILESDIR}"/${P}-cmake4.patch # thx opensuse - "${FILESDIR}"/${P}-cmake-{findgsl,findhdf5}.patch # bugs #884625, #954233 - "${FILESDIR}"/${P}-hdf5cxx.patch # thx opensuse -) - -src_prepare() { - rm -r cmake/3rdparty || die - - cmake_src_prepare - - sed -e "/^kst_revision_project_name/ s/^/# removed by ebuild: /" \ - -i CMakeLists.txt || die -} - -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_revision=${PV/*_p/-} - -Dkst_dbgsym=ON - -Dkst_pch=OFF - -Dkst_python=OFF - -Dkst_qt5=ON - -Dkst_qt4=OFF - -Dkst_rpath=OFF - -Dkst_svnversion=OFF - -Dkst_verbose=ON - -Dkst_release=$(usex debug OFF ON) - -Dkst_test=$(usex test) - ) - cmake_src_configure -}
