diff --git a/windows/deps/Makefile b/windows/deps/Makefile index 7a25c164fbcbcfba74519b46c9a99e01c498b8f5..2b6647e445962ba0a9ec5859465989ac88d59f4b 100644 --- a/windows/deps/Makefile +++ b/windows/deps/Makefile @@ -149,8 +149,6 @@ lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.ta rm -rf $@ mkdir $@ for f in $^; do tar xf $$f --directory $@ $(MSYS2_EXCLUDES); done - # Workaround for https://github.com/msys2/MINGW-packages/issues/22712 - patch -d lib64-msys2/mingw64/lib/pkgconfig/ < hdf5.pc.patch touch $@ mingw64: tarballs/mingw-w64-x86_64-gcc-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gcc-libs-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gmp-$(MINGW64_GMP_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-binutils-$(MINGW64_BINUTILS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-headers-git-$(MINGW64_HEADERS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-crt-git-$(MINGW64_CRT_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-winpthreads-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libwinpthread-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zstd-$(MINGW64_ZSTD_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-isl-$(MINGW64_ISL_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpc-$(MINGW64_MPC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpfr-$(MINGW64_MPFR_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libiconv-$(MINGW64_LIBICONV_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-windows-default-manifest-$(MINGW64_WINDOWS_DEFAULT_MANIFEST_VERSION)-any.pkg.tar.zst diff --git a/windows/deps/hdf5.pc.patch b/windows/deps/hdf5.pc.patch deleted file mode 100644 index 40565e01b3ed891f179f3d8a44fe9ea79c422da8..0000000000000000000000000000000000000000 --- a/windows/deps/hdf5.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- hdf5.pc~ 2024-10-30 08:57:30.000000000 +0100 -+++ hdf5.pc 2024-12-03 14:38:44.633291490 +0100 -@@ -10,5 +10,5 @@ - Cflags: -I${includedir} - Libs: -L${libdir} -lhdf5 - Requires: --Libs.private: -lzlib-static --Requires.private: libcrypto libssl libcurl -+Libs.private: -+Requires.private: libcrypto libssl libcurl zlib diff --git a/windows/deps/versions.mk b/windows/deps/versions.mk index 24e0bf15ee77ccef63ffa2c8ea15e1f92bf319bb..eb99d8c92bd43b512585da7969c8135844e768a8 100644 --- a/windows/deps/versions.mk +++ b/windows/deps/versions.mk @@ -33,7 +33,7 @@ MINGW64_ZLIB_VERSION = 1.3.1-1 # Dependency of matio # pacman -Ss mingw-w64-x86_64-hdf5 -MINGW64_HDF5_VERSION = 1.14.5-1 +MINGW64_HDF5_VERSION = 1.14.5-2 # Dependency of HDF5 (provides szip library) # pacman -Ss mingw-w64-x86_64-libaec