Date: Wed, 25 Mar 2026 17:48:07 +0000 From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5b6afe3b76b2 - main - science/kst: Update to 3.0.0 and switch to Qt6 Message-ID: <69c41fd7.381dc.4209d748@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b6afe3b76b249d94fcfb996cb0982c7191afd24 commit 5b6afe3b76b249d94fcfb996cb0982c7191afd24 Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2026-03-25 17:47:47 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2026-03-25 17:47:47 +0000 science/kst: Update to 3.0.0 and switch to Qt6 - Enable NETCDF support - Drop stale patches --- science/kst/Makefile | 30 ++-- science/kst/distinfo | 6 +- science/kst/files/patch-CMakeLists.txt | 35 ----- .../kst/files/patch-cmake_modules_FindHDF5.cmake | 11 -- science/kst/files/patch-src__kst__CMakeLists.txt | 13 -- .../kst/files/patch-src_datasources_hdf5_hdf5.h | 11 -- science/kst/pkg-plist | 152 ++++++++++----------- 7 files changed, 88 insertions(+), 170 deletions(-) diff --git a/science/kst/Makefile b/science/kst/Makefile index b51fa4f22aa3..02f8c16587ab 100644 --- a/science/kst/Makefile +++ b/science/kst/Makefile @@ -1,8 +1,5 @@ PORTNAME= kst -DISTVERSIONPREFIX= v -DISTVERSION= ${KST_VERSION} -DISTVERSIONSUFFIX= -${KST_DATE} -PORTREVISION= 2 +DISTVERSION= 3.0.0 CATEGORIES= science MAINTAINER= makc@FreeBSD.org @@ -18,24 +15,17 @@ LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LGPL LIB_DEPENDS= libgsl.so:math/gsl \ libtiff.so:graphics/tiff -USES= cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig \ - qt:5 shared-mime-info -USE_QT= concurrent core gui network printsupport svg widgets xml \ - buildtools:build linguisttools:build qmake:build -USE_LDCONFIG= yes +USES= cmake compiler:c++20-lang desktop-file-utils gl kde:6 \ + pkgconfig qt:6 shared-mime-info +USE_GL= gl +USE_QT= base svg tools -KST_VERSION= 2.1 -KST_DATE= 2024-10-20 KDE_INVENT= ${DISTVERSIONFULL} graphics kst-plot -CMAKE_ARGS= -Dkst_install_prefix=${PREFIX} \ - -Dkst_pch=off \ - -DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON - -PLIST_SUB= SHLIB_VER=${KST_VERSION} +CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON OPTIONS_DEFINE= FITS HDF5 MATLAB NETCDF -OPTIONS_DEFAULT= FITS HDF5 MATLAB +OPTIONS_DEFAULT= FITS HDF5 MATLAB NETCDF OPTIONS_SUB= yes FITS_DESC= Support for data in FITS format @@ -50,9 +40,9 @@ MATLAB_DESC= Support for data in MATLAB format MATLAB_LIB_DEPENDS= libmatio.so:math/matio MATLAB_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Matio=ON -NETCDF_DESC= Support for data in NetCDF format (broken) -NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf -NETCDF_IGNORE= does not support NetCDF 4 +NETCDF_DESC= Support for data in NetCDF format +NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf \ + libnetcdf_c++4.so:science/netcdf-cxx NETCDF_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON .include <bsd.port.mk> diff --git a/science/kst/distinfo b/science/kst/distinfo index 6a9e17e75cd7..4e9c0886b0a2 100644 --- a/science/kst/distinfo +++ b/science/kst/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730366179 -SHA256 (kst-plot-v2.1-2024-10-20.tar.bz2) = 80f051f5979207a0be7c81c5bb9bea9e9acc2a78afd8a17e4323d3cf6c375def -SIZE (kst-plot-v2.1-2024-10-20.tar.bz2) = 18271866 +TIMESTAMP = 1774455993 +SHA256 (kst-plot-3.0.0.tar.bz2) = 8cade61c828588a12c1081434ae3428d2909b73e1f61b537b40457d473886bf4 +SIZE (kst-plot-3.0.0.tar.bz2) = 15571035 diff --git a/science/kst/files/patch-CMakeLists.txt b/science/kst/files/patch-CMakeLists.txt deleted file mode 100644 index ba87f62b626b..000000000000 --- a/science/kst/files/patch-CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ ---- CMakeLists.txt.orig 2024-08-25 02:15:46 UTC -+++ CMakeLists.txt -@@ -12,6 +12,7 @@ if(${CMAKE_MAJOR_VERSION} EQUAL 3) - - if(${CMAKE_MAJOR_VERSION} EQUAL 3) - cmake_policy(SET CMP0043 OLD) -+ cmake_policy(SET CMP0046 OLD) - endif() - - # figure out if we use MinGW with Ninja: call with -DCC=gcc -@@ -72,12 +73,6 @@ project(Kst) - 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") --else() -- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE) --endif() - - - if(kst_sanitize) -@@ -240,11 +235,6 @@ message(STATUS) - # React on options - - --if(kst_verbose) -- set(CMAKE_VERBOSE_MAKEFILE 1) --else() -- set(CMAKE_VERBOSE_MAKEFILE 0) --endif() - - if(kst_install_prefix) - set(CMAKE_INSTALL_PREFIX ${kst_install_prefix} CACHE PATH "User's choice for install prefix" FORCE) diff --git a/science/kst/files/patch-cmake_modules_FindHDF5.cmake b/science/kst/files/patch-cmake_modules_FindHDF5.cmake deleted file mode 100644 index 432635ca2027..000000000000 --- a/science/kst/files/patch-cmake_modules_FindHDF5.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/modules/FindHDF5.cmake.orig 2024-08-25 02:15:46 UTC -+++ cmake/modules/FindHDF5.cmake -@@ -22,7 +22,7 @@ if(NOT HDF5_INCLUDEDIR) - endif() - - if(HDF5_INCLUDEDIR AND HDF5_LIBRARIES) -- FIND_LIBRARY(HDF5_LIBRARY_CPP hdf5_c++ -+ FIND_LIBRARY(HDF5_LIBRARY_CPP hdf5_c++ hdf5_cpp - HINTS ${HDF5_LIBRARY_DIRS}) - set(HDF5_LIBRARY_C -L${HDF5_LIBRARY_DIRS} ${HDF5_LIBRARIES} CACHE STRING "" FORCE) - else() diff --git a/science/kst/files/patch-src__kst__CMakeLists.txt b/science/kst/files/patch-src__kst__CMakeLists.txt deleted file mode 100644 index c137cdd65d1c..000000000000 --- a/science/kst/files/patch-src__kst__CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- src/kst/CMakeLists.txt.orig 2021-01-24 05:51:19 UTC -+++ src/kst/CMakeLists.txt -@@ -38,9 +38,7 @@ 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) -+ install(FILES ${man} DESTINATION share/man/man1) - - set(k ${kst_dir}/src/kst) - # install(FILES ${k}/kstplugin.desktop diff --git a/science/kst/files/patch-src_datasources_hdf5_hdf5.h b/science/kst/files/patch-src_datasources_hdf5_hdf5.h deleted file mode 100644 index 64fd2489d20e..000000000000 --- a/science/kst/files/patch-src_datasources_hdf5_hdf5.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/datasources/hdf5/hdf5.h.orig 2024-08-25 02:15:46 UTC -+++ 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/science/kst/pkg-plist b/science/kst/pkg-plist index 20a98f0be737..cac39538554c 100644 --- a/science/kst/pkg-plist +++ b/science/kst/pkg-plist @@ -1,79 +1,76 @@ -bin/kst2 -lib/kst2/plugins/libkst2_dataobject_activitylevel.so -lib/kst2/plugins/libkst2_dataobject_bin.so -lib/kst2/plugins/libkst2_dataobject_chop.so -lib/kst2/plugins/libkst2_dataobject_convolution_convolve.so -lib/kst2/plugins/libkst2_dataobject_convolution_deconvolve.so -lib/kst2/plugins/libkst2_dataobject_correlation_autocorrelation.so -lib/kst2/plugins/libkst2_dataobject_correlation_crosscorrelation.so -lib/kst2/plugins/libkst2_dataobject_crossspectrum.so -lib/kst2/plugins/libkst2_dataobject_effectivebandwidth.so -lib/kst2/plugins/libkst2_dataobject_genericfilter.so -lib/kst2/plugins/libkst2_dataobject_interpolations_akima.so -lib/kst2/plugins/libkst2_dataobject_interpolations_akimaperiodic.so -lib/kst2/plugins/libkst2_dataobject_interpolations_cspline.so -lib/kst2/plugins/libkst2_dataobject_interpolations_csplineperiodic.so -lib/kst2/plugins/libkst2_dataobject_interpolations_linear.so -lib/kst2/plugins/libkst2_dataobject_interpolations_polynomial.so -lib/kst2/plugins/libkst2_dataobject_linefit.so -lib/kst2/plugins/libkst2_dataobject_lockin.so -lib/kst2/plugins/libkst2_dataobject_noiseaddition.so -lib/kst2/plugins/libkst2_dataobject_periodogram.so -lib/kst2/plugins/libkst2_dataobject_phase.so -lib/kst2/plugins/libkst2_dataobject_shift.so -lib/kst2/plugins/libkst2_dataobject_statistics.so -lib/kst2/plugins/libkst2_dataobject_syncbin.so -lib/kst2/plugins/libkst2_datasource_ascii.so -lib/kst2/plugins/libkst2_datasource_bis.so -%%FITS%%lib/kst2/plugins/libkst2_datasource_fitsimage.so -%%HDF5%%lib/kst2/plugins/libkst2_datasource_hdf5.so -lib/kst2/plugins/libkst2_datasource_its.so -%%MATLAB%%lib/kst2/plugins/libkst2_datasource_matlab.so -%%NETCDF%%lib/kst2/plugins/libkst2_datasource_netcdf.so -lib/kst2/plugins/libkst2_datasource_qimagesource.so -lib/kst2/plugins/libkst2_datasource_sourcelist.so -lib/kst2/plugins/libkst2_datasource_tiff16source.so -lib/kst2/plugins/libkst2_filters_boxcar.so -lib/kst2/plugins/libkst2_filters_butterworth_bandpass.so -lib/kst2/plugins/libkst2_filters_butterworth_bandstop.so -lib/kst2/plugins/libkst2_filters_butterworth_highpass.so -lib/kst2/plugins/libkst2_filters_butterworth_lowpass.so -lib/kst2/plugins/libkst2_filters_cumulativeaverage.so -lib/kst2/plugins/libkst2_filters_cumulativesum.so -lib/kst2/plugins/libkst2_filters_despike.so -lib/kst2/plugins/libkst2_filters_differentiation.so -lib/kst2/plugins/libkst2_filters_exponential.so -lib/kst2/plugins/libkst2_filters_flag.so -lib/kst2/plugins/libkst2_filters_movingaverage.so -lib/kst2/plugins/libkst2_filters_movingmedian.so -lib/kst2/plugins/libkst2_filters_unwind.so -lib/kst2/plugins/libkst2_filters_window.so -lib/kst2/plugins/libkst2_fits_exponential_unweighted.so -lib/kst2/plugins/libkst2_fits_exponential_weighted.so -lib/kst2/plugins/libkst2_fits_gaussian_unweighted.so -lib/kst2/plugins/libkst2_fits_gaussian_weighted.so -lib/kst2/plugins/libkst2_fits_gradient_unweighted.so -lib/kst2/plugins/libkst2_fits_gradient_weighted.so -lib/kst2/plugins/libkst2_fits_kneefrequency.so -lib/kst2/plugins/libkst2_fits_linear_unweighted.so -lib/kst2/plugins/libkst2_fits_linear_weighted.so -lib/kst2/plugins/libkst2_fits_lorentzian_unweighted.so -lib/kst2/plugins/libkst2_fits_lorentzian_weighted.so -lib/kst2/plugins/libkst2_fits_polynomial_unweighted.so -lib/kst2/plugins/libkst2_fits_polynomial_weighted.so -lib/kst2/plugins/libkst2_fits_sinusoid_unweighted.so -lib/kst2/plugins/libkst2_fits_sinusoid_weighted.so -lib/libkst2app.a -lib/libkst2core.so -lib/libkst2core.so.2 -lib/libkst2core.so.%%SHLIB_VER%% -lib/libkst2math.so -lib/libkst2math.so.2 -lib/libkst2math.so.%%SHLIB_VER%% -lib/libkst2widgets.so -lib/libkst2widgets.so.2 -lib/libkst2widgets.so.%%SHLIB_VER%% -share/applications/kst2.desktop +bin/kst +include/Kst6App/kstapp_export.h +include/Kst6Core/kstcore_export.h +include/Kst6Math/kstmath_export.h +include/Kst6Widgets/kstwidgets_export.h +lib/kst/libKst6App.a +lib/kst/libKst6Core.so +lib/kst/libKst6Math.so +lib/kst/libKst6Widgets.so +lib/kst/libdataobject_activitylevel.so +lib/kst/libdataobject_bin.so +lib/kst/libdataobject_chop.so +lib/kst/libdataobject_convolution_convolve.so +lib/kst/libdataobject_convolution_deconvolve.so +lib/kst/libdataobject_correlation_autocorrelation.so +lib/kst/libdataobject_correlation_crosscorrelation.so +lib/kst/libdataobject_crossspectrum.so +lib/kst/libdataobject_effectivebandwidth.so +lib/kst/libdataobject_genericfilter.so +lib/kst/libdataobject_interpolations_akima.so +lib/kst/libdataobject_interpolations_akimaperiodic.so +lib/kst/libdataobject_interpolations_cspline.so +lib/kst/libdataobject_interpolations_csplineperiodic.so +lib/kst/libdataobject_interpolations_linear.so +lib/kst/libdataobject_interpolations_polynomial.so +lib/kst/libdataobject_linefit.so +lib/kst/libdataobject_lockin.so +lib/kst/libdataobject_noiseaddition.so +lib/kst/libdataobject_periodogram.so +lib/kst/libdataobject_phase.so +lib/kst/libdataobject_shift.so +lib/kst/libdataobject_statistics.so +lib/kst/libdataobject_syncbin.so +lib/kst/libdatasource_ascii.so +%%FITS%%lib/kst/libdatasource_fitsimage.so +%%HDF5%%lib/kst/libdatasource_hdf5.so +%%MATLAB%%lib/kst/libdatasource_matlab.so +%%NETCDF%%lib/kst/libdatasource_netcdf.so +lib/kst/libdatasource_qimagesource.so +lib/kst/libdatasource_sourcelist.so +lib/kst/libdatasource_tiff16source.so +lib/kst/libfilters_boxcar.so +lib/kst/libfilters_butterworth_bandpass.so +lib/kst/libfilters_butterworth_bandstop.so +lib/kst/libfilters_butterworth_highpass.so +lib/kst/libfilters_butterworth_lowpass.so +lib/kst/libfilters_cumulativeaverage.so +lib/kst/libfilters_cumulativesum.so +lib/kst/libfilters_despike.so +lib/kst/libfilters_differentiation.so +lib/kst/libfilters_exponential.so +lib/kst/libfilters_flag.so +lib/kst/libfilters_hpboxcar.so +lib/kst/libfilters_movingaverage.so +lib/kst/libfilters_movingmedian.so +lib/kst/libfilters_unwind.so +lib/kst/libfilters_window.so +lib/kst/libfits_exponential_unweighted.so +lib/kst/libfits_exponential_weighted.so +lib/kst/libfits_gaussian_unweighted.so +lib/kst/libfits_gaussian_weighted.so +lib/kst/libfits_gradient_unweighted.so +lib/kst/libfits_gradient_weighted.so +lib/kst/libfits_kneefrequency.so +lib/kst/libfits_linear_unweighted.so +lib/kst/libfits_linear_weighted.so +lib/kst/libfits_lorentzian_unweighted.so +lib/kst/libfits_lorentzian_weighted.so +lib/kst/libfits_polynomial_unweighted.so +lib/kst/libfits_polynomial_weighted.so +lib/kst/libfits_sinusoid_unweighted.so +lib/kst/libfits_sinusoid_weighted.so +share/applications/org.kde.kst.desktop share/icons/hicolor/128x128/apps/kst.png share/icons/hicolor/128x128/mimetypes/application-x-kst.png share/icons/hicolor/32x32/apps/kst.png @@ -84,5 +81,6 @@ share/icons/hicolor/64x64/apps/kst.png share/icons/hicolor/64x64/mimetypes/application-x-kst.png share/icons/hicolor/scalable/apps/kst.svg share/icons/hicolor/scalable/mimetypes/application-x-kst.svg -share/man/man1/kst2.1.gz +share/man/man1/kst.1.gz +share/metainfo/org.kde.kst.metainfo.xml share/mime/packages/x-kst.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c41fd7.381dc.4209d748>