diff --git a/science/kst2/Makefile b/science/kst2/Makefile index 16b6c48a3c5e..65850e2294f1 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -1,61 +1,60 @@ # Created by: Markus Brueffer PORTNAME= kst DISTVERSION= ${KST_VERSION}.${KST_DATE} -PORTREVISION= 4 CATEGORIES= science MAINTAINER= makc@FreeBSD.org COMMENT= Data viewing and plotting tool LICENSE= GPLv2 GFDL LGPL20 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_GFDL= ${WRKSRC}/COPYING-DOCS 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 KST_VERSION= 2.0.8 -KST_DATE= 20210124 -KST_COMMIT= 38eddb53 -KDE_INVENT= 38eddb5322a1d557f9d86ea95d456d76272941e3 graphics kst-plot +KST_DATE= 20220216 +KST_COMMIT= 40cdf2d3 +KDE_INVENT= 40cdf2d397e4277ee7226188ef89ae3e0f12d884 graphics kst-plot CMAKE_ARGS= -Dkst_install_prefix=${PREFIX} \ -Dkst_pch=off \ -Dkst_version_string=${KST_VERSION} \ -Dkst_revision="${KST_COMMIT} ${KST_DATE}" \ -DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON \ -Dkst_qt5=on PLIST_SUB= SHLIB_VER=${KST_VERSION} OPTIONS_DEFINE= FITS HDF5 MATLAB NETCDF OPTIONS_DEFAULT= FITS HDF5 MATLAB OPTIONS_SUB= yes FITS_DESC= Support for data in FITS format FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio FITS_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CFITSIO=ON HDF5_DESC= Support for data in HDF5 format HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 HDF5_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON 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_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON .include diff --git a/science/kst2/distinfo b/science/kst2/distinfo index 51c87cf0f0d4..00eb7a0ce55e 100644 --- a/science/kst2/distinfo +++ b/science/kst2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620381589 -SHA256 (graphics-kst-plot-38eddb5322a1d557f9d86ea95d456d76272941e3_GL0.tar.gz) = 0ffcb24c0aaa416ba8b879e4576ab35e23adde780f7d8a64ceffb27fe8f33f57 -SIZE (graphics-kst-plot-38eddb5322a1d557f9d86ea95d456d76272941e3_GL0.tar.gz) = 18792017 +TIMESTAMP = 1646996686 +SHA256 (graphics-kst-plot-40cdf2d397e4277ee7226188ef89ae3e0f12d884_GL0.tar.gz) = cf6c0b33d915906593cd7613246f4679dcdefecb7e50b67812eeb57866e37ab8 +SIZE (graphics-kst-plot-40cdf2d397e4277ee7226188ef89ae3e0f12d884_GL0.tar.gz) = 18794059 diff --git a/science/kst2/files/patch-CMakeLists.txt b/science/kst2/files/patch-CMakeLists.txt index 324cf2ae729f..a5a4d70c7be2 100644 --- a/science/kst2/files/patch-CMakeLists.txt +++ b/science/kst2/files/patch-CMakeLists.txt @@ -1,40 +1,27 @@ --- CMakeLists.txt.orig 2021-01-24 05:51:19 UTC +++ CMakeLists.txt @@ -72,12 +72,6 @@ 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") -else() - set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE) -endif() if(kst_sanitize) -@@ -116,10 +110,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() @@ -240,11 +234,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/kst2/files/patch-src_datasources_hdf5_hdf5.cpp b/science/kst2/files/patch-src_datasources_hdf5_hdf5.cpp deleted file mode 100644 index 9cca34792f42..000000000000 --- a/science/kst2/files/patch-src_datasources_hdf5_hdf5.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/datasources/hdf5/hdf5.cpp.orig 2021-01-24 05:51:19 UTC -+++ src/datasources/hdf5/hdf5.cpp -@@ -308,7 +308,11 @@ herr_t HDF5Source::visitFunc(hid_t id, const char* nam - return 0; - } - -+#if H5_VERSION_GE(1,12,0) -+ status = H5Oget_info_by_name(id, name, &infobuf, H5O_INFO_BASIC, H5P_DEFAULT); -+#else - status = H5Oget_info_by_name(id, name, &infobuf, H5P_DEFAULT); -+#endif - if(status == 0){ - if(infobuf.type == H5O_TYPE_DATASET){ - H5::DataSet dataset = h5Source->_hdfFile->openDataSet(name); diff --git a/science/kst2/files/patch-src_widgets_gradienteditor.h b/science/kst2/files/patch-src_widgets_gradienteditor.h deleted file mode 100644 index e4a0ff3e74d7..000000000000 --- a/science/kst2/files/patch-src_widgets_gradienteditor.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/widgets/gradienteditor.h.orig 2020-05-18 16:26:46 UTC -+++ src/widgets/gradienteditor.h -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include "kstwidgets_export.h" -