diff --git a/mingw-w64-vtk/012-fix-build-with-netcdf-4.9.3.patch b/mingw-w64-vtk/012-fix-build-with-netcdf-4.9.3.patch new file mode 100644 index 0000000000..77c50322c5 --- /dev/null +++ b/mingw-w64-vtk/012-fix-build-with-netcdf-4.9.3.patch @@ -0,0 +1,22 @@ +--- a/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c ++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c +@@ -243,7 +243,7 @@ + vals[0] = 0; /* fill value */ + /* create attribute to cause variable to fill with zeros per routine spec + */ +- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { ++ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { + snprintf(errmsg, MAX_ERR_LENGTH, + "ERROR: failed to create property name fill attribute in file id %d", exoid); + ex_err_fn(exoid, __func__, errmsg, status); +--- a/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c ++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c +@@ -172,7 +172,7 @@ + + /* create attribute to cause variable to fill with zeros per routine spec + */ +- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { ++ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { + snprintf(errmsg, MAX_ERR_LENGTH, + "ERROR: failed to create property name fill attribute in file id %d", exoid); + ex_err_fn(exoid, __func__, errmsg, status); diff --git a/mingw-w64-vtk/PKGBUILD b/mingw-w64-vtk/PKGBUILD index 399a03c78c..f97243cf70 100644 --- a/mingw-w64-vtk/PKGBUILD +++ b/mingw-w64-vtk/PKGBUILD @@ -4,8 +4,8 @@ _realname=vtk pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=9.4.1 -pkgrel=3 +pkgver=9.4.2 +pkgrel=1 pkgdesc="A software system for 3D computer graphics, image processing and visualization (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -118,8 +118,9 @@ source=(https://www.vtk.org/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz "007-dll-export-some-functions.patch" "008-update-to-diy-3.6.0.patch" "009-diy-3-compatibility.patch" - "011-anari-integer-types.patch") -sha256sums=('c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529' + "011-anari-integer-types.patch" + "012-fix-build-with-netcdf-4.9.3.patch") +sha256sums=('36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02' '411b0521fcd2864acae0af20ba6334f69f7c605c9e31996529f64aa749d61065' '410ddfbb2acb66746771a0e1f3ad81230904f712729af29cd26e8aaaa19dc48e' '2d1795111b410e0fbb8e7b08fab2e83e37e74ca0d7fd6685d435d4b27f355b87' @@ -129,7 +130,8 @@ sha256sums=('c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529' '6cc0c44b2cb9693b8ae101fdde186561633fc6e6629c6e797231331895baa5df' '7602c7b4afa61f57f27022d4ea015c6e3c1d4ab8df5907ca828e08bb48c26b20' '19ffd04b06b4c3c0c3f0b1b375cbac956191d4b7d3fa1066dc62bbfe78d69908' - 'd76aa1788bbe2dd14390d4c7a4e65bcd652e4521324a7982ef7ead2306c82436') + 'd76aa1788bbe2dd14390d4c7a4e65bcd652e4521324a7982ef7ead2306c82436' + 'eabe075c71ea6bbabfe3d0f1bf10f01ec299c88a8a825866f944eeb0b067aa2e') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -152,7 +154,8 @@ prepare() { 006-fix-compile-error-for-contour-tree-print.patch \ 008-update-to-diy-3.6.0.patch \ 009-diy-3-compatibility.patch \ - 011-anari-integer-types.patch + 011-anari-integer-types.patch \ + 012-fix-build-with-netcdf-4.9.3.patch # Succeeds with Clang but fails with GCC! if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then