commit: d4b0f3bd49087baa53c0b693c54e0a0b10c825af Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 30 14:58:58 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=d4b0f3bd
sci-visualization/kst: add 2.1.0_p20250830, don't compress manpages Bug: https://bugs.gentoo.org/812017 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-visualization/kst/Manifest | 1 + .../files/kst-2.1.0_p20250830-cmake-findhdf5.patch | 43 +++++++++++ .../kst-2.1.0_p20250830-no-compress-man.patch | 31 ++++++++ sci-visualization/kst/kst-2.1.0_p20250830.ebuild | 83 ++++++++++++++++++++++ 4 files changed, 158 insertions(+) diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index 6ac77b381ddd..aae93bd695f5 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1 +1,2 @@ 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_p20250830-cmake-findhdf5.patch b/sci-visualization/kst/files/kst-2.1.0_p20250830-cmake-findhdf5.patch new file mode 100644 index 000000000000..cfc3bb33f074 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.1.0_p20250830-cmake-findhdf5.patch @@ -0,0 +1,43 @@ +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(TIFF) +- 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_p20250830-no-compress-man.patch b/sci-visualization/kst/files/kst-2.1.0_p20250830-no-compress-man.patch new file mode 100644 index 000000000000..5a92c7ec87f5 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.1.0_p20250830-no-compress-man.patch @@ -0,0 +1,31 @@ +From cb89bb697a7d973ab1c9e5593ad4a14f8964649e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sat, 30 Aug 2025 17:28:31 +0200 +Subject: [PATCH] Do not compress man pages + +Let distributions do that. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + src/kst/CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/kst/CMakeLists.txt b/src/kst/CMakeLists.txt +index ac100ac1..b6eca51d 100644 +--- a/src/kst/CMakeLists.txt ++++ b/src/kst/CMakeLists.txt +@@ -38,9 +38,8 @@ kst_install_executable() + if(UNIX AND NOT APPLE) + set(man ${CMAKE_BINARY_DIR}/${kst_binary_name}.1) + configure_file(${kst_dir}/src/kst/kst.1.txt ${man}) +- install(CODE "execute_process(COMMAND gzip ${man})") +- set_source_files_properties(${man}.gz PROPERTIES GENERATED TRUE) +- install(FILES ${man}.gz DESTINATION share/man/man1) ++ set_source_files_properties(${man} PROPERTIES GENERATED TRUE) ++ install(FILES ${man} DESTINATION share/man/man1) + + set(k ${kst_dir}/src/kst) + # install(FILES ${k}/kstplugin.desktop +-- +2.51.0 + diff --git a/sci-visualization/kst/kst-2.1.0_p20250830.ebuild b/sci-visualization/kst/kst-2.1.0_p20250830.ebuild new file mode 100644 index 000000000000..0bea56ac9795 --- /dev/null +++ b/sci-visualization/kst/kst-2.1.0_p20250830.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_REMOVE_MODULES_LIST=( FindHDF5 ) +KDE_ORG_CATEGORY=graphics +KDE_ORG_NAME=kst-plot +KDE_ORG_COMMIT=c250288dcae3b476d55321b935fbaab5dec6b28b +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=( + # downstream patches + "${FILESDIR}"/${PN}-2.0.8-getdata-drop-bogus-lib_debug.patch # bug #593848 + "${FILESDIR}"/${P}-cmake-findhdf5.patch # bug #954233 + "${FILESDIR}"/${P}-no-compress-man.patch # bug #812017 +) + +src_prepare() { + rm -r cmake/3rdparty || die + rm -r pyKst || die # unused w/ -Dkst_python=OFF below + + 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_rpath=OFF + -Dkst_svnversion=OFF + -Dkst_verbose=ON + -Dkst_release=$(usex debug OFF ON) + -Dkst_test=$(usex test) + ) + cmake_src_configure +}
