From owner-svn-ports-head@freebsd.org Tue Feb 23 15:46:38 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6109154813E; Tue, 23 Feb 2021 15:46:38 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DlNhG2DfPz3jRJ; Tue, 23 Feb 2021 15:46:38 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F6DF1BD5C; Tue, 23 Feb 2021 15:46:38 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11NFkc5Q017102; Tue, 23 Feb 2021 15:46:38 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11NFkbLd017098; Tue, 23 Feb 2021 15:46:37 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202102231546.11NFkbLd017098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Tue, 23 Feb 2021 15:46:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566405 - in head/science/kst2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/science/kst2: . files X-SVN-Commit-Revision: 566405 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 15:46:38 -0000 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 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 + + #include +-#include ++#include + #include + + #include "debug.h"