Date: Tue, 23 Feb 2021 15:46:37 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566405 - in head/science/kst2: . files Message-ID: <202102231546.11NFkbLd017098@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Feb 23 15:46:37 2021 New Revision: 566405 URL: https://svnweb.freebsd.org/changeset/ports/566405 Log: science/kst2: - Add support for HDF5 v1.12 - while here replace sed with patch PR: 251894 Added: head/science/kst2/files/patch-src_datasources_hdf5_hdf5.cpp (contents, props changed) head/science/kst2/files/patch-src_datasources_hdf5_hdf5.h (contents, props changed) Modified: head/science/kst2/Makefile Modified: head/science/kst2/Makefile ============================================================================== --- head/science/kst2/Makefile Tue Feb 23 15:43:09 2021 (r566404) +++ head/science/kst2/Makefile Tue Feb 23 15:46:37 2021 (r566405) @@ -58,7 +58,4 @@ NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_IGNORE= does not support NetCDF 4 NETCDF_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON -post-patch: - ${REINPLACE_CMD} 's,hdf5/serial/,,' ${WRKSRC}/src/datasources/hdf5/hdf5.h - .include <bsd.port.mk> Added: head/science/kst2/files/patch-src_datasources_hdf5_hdf5.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/kst2/files/patch-src_datasources_hdf5_hdf5.cpp Tue Feb 23 15:46:37 2021 (r566405) @@ -0,0 +1,14 @@ +--- 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); Added: head/science/kst2/files/patch-src_datasources_hdf5_hdf5.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/kst2/files/patch-src_datasources_hdf5_hdf5.h Tue Feb 23 15:46:37 2021 (r566405) @@ -0,0 +1,11 @@ +--- src/datasources/hdf5/hdf5.h.orig 2021-01-24 05:51:19 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102231546.11NFkbLd017098>