# HG changeset patch # User John Donoghue # Date 1454506690 18000 # Node ID a956f3b29f93c88adca3143b54e9193aa2909bb3 # Parent c25eb2c88594ccb0e5744fc504800d2bc1f216e5 of-netcdf: update to 1.0.8 * src/of-netcdf.mk: update version, checksum * src/of-netcdf-1-fixes.patch: removed * build_packages.m: update netcdf version * dist-files.mk: removed of-netcdf-1-fixes.patch diff -r c25eb2c88594 -r a956f3b29f93 build_packages.m --- a/build_packages.m Wed Feb 03 08:38:06 2016 -0500 +++ b/build_packages.m Wed Feb 03 08:38:10 2016 -0500 @@ -44,7 +44,7 @@ try_install fl-core-1.0.0.tar.gz try_install tsa-4.3.2.tar.gz try_install dicom-0.1.1.tar.gz -try_install netcdf-1.0.7.tar.gz +try_install netcdf-1.0.8.tar.gz try_install ltfat-2.1.1.tar.gz try_install database-2.3.2.tar.gz try_install instrument-control-0.2.1.tar.gz diff -r c25eb2c88594 -r a956f3b29f93 dist-files.mk --- a/dist-files.mk Wed Feb 03 08:38:06 2016 -0500 +++ b/dist-files.mk Wed Feb 03 08:38:10 2016 -0500 @@ -482,7 +482,6 @@ of-miscellaneous.mk \ of-nan-1-cross-fixes.patch \ of-nan.mk \ - of-netcdf-1-fixes.patch \ of-netcdf.mk \ of-nurbs-1-fixes.patch \ of-nurbs.mk \ diff -r c25eb2c88594 -r a956f3b29f93 src/of-netcdf-1-fixes.patch --- a/src/of-netcdf-1-fixes.patch Wed Feb 03 08:38:06 2016 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -diff -ur netcdf.orig/src/__netcdf__.cc netcdf/src/__netcdf__.cc ---- netcdf.orig/src/__netcdf__.cc 2015-09-26 07:53:37.710240236 -0400 -+++ netcdf/src/__netcdf__.cc 2015-09-26 13:58:27.115208120 -0400 -@@ -551,8 +551,14 @@ - check_err(nc_inq_unlimdims(ncid, &nunlimdims, NULL)); - Array unlimdimids = Array(dim_vector(1,nunlimdims)); - check_err(nc_inq_unlimdims(ncid, &nunlimdims, unlimdimids.fortran_vec())); -+ -+ Array d_unlimdimids = Array(dim_vector(1,nunlimdims)); -+ for (octave_idx_type idx=0;idx varids = Array(dim_vector(1,nvars)); - check_err(nc_inq_varids(ncid, &nvars, varids.fortran_vec())); - -- return octave_value(varids); -+ Array d_varids = Array(dim_vector(1,nvars)); -+ for (octave_idx_type idx=0;idx dimids = Array(dim_vector(1,ndims)); - check_err(nc_inq_dimids(ncid, &ndims, dimids.fortran_vec(),include_parents)); -+ -+ Array d_dimids = Array(dim_vector(1,ndims)); -+ for (octave_idx_type idx=0;idx ncids = Array(dim_vector(1,numgrps)); - check_err(nc_inq_grps(ncid, NULL, ncids.fortran_vec())); -- -- return octave_value(ncids); -+ -+ Array d_ncids = Array(dim_vector(1,numgrps)); -+ for (octave_idx_type idx=0;idx