From 02ecd02d8d191e858f1aa63c884bb4a66b8bedf2 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sun, 29 May 2022 09:20:21 +0530 Subject: [PATCH] python-h5py: update to 3.7.0 --- mingw-w64-python-h5py/001-mingw-python.patch | 10 +++++----- mingw-w64-python-h5py/PKGBUILD | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mingw-w64-python-h5py/001-mingw-python.patch b/mingw-w64-python-h5py/001-mingw-python.patch index 3b0333aa32..300d9c29d3 100644 --- a/mingw-w64-python-h5py/001-mingw-python.patch +++ b/mingw-w64-python-h5py/001-mingw-python.patch @@ -1,9 +1,9 @@ ---- h5py-3.3.0/setup_configure.py.orig 2021-07-14 20:32:17.516742500 +0200 -+++ h5py-3.3.0/setup_configure.py 2021-07-14 20:34:00.998030600 +0200 -@@ -202,8 +202,12 @@ +--- a/setup_configure.py ++++ b/setup_configure.py +@@ -224,8 +224,12 @@ + default_path = 'libhdf5.dylib' regexp = re.compile(r'^libhdf5.dylib') - elif sys.platform.startswith('win') or \ - sys.platform.startswith('cygwin'): + elif sys.platform.startswith('win'): - default_path = 'hdf5.dll' - regexp = re.compile(r'^hdf5.dll') + if 'GCC' in sys.version: diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD index a778fae822..fe234a667a 100644 --- a/mingw-w64-python-h5py/PKGBUILD +++ b/mingw-w64-python-h5py/PKGBUILD @@ -6,13 +6,13 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=3.6.0 +pkgver=3.7.0 pkgrel=1 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://www.h5py.org/" -license=('BSD') +license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-six" "${MINGW_PACKAGE_PREFIX}-hdf5") @@ -24,12 +24,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cython" source=(https://github.com/h5py/h5py/releases/download/${pkgver}/h5py-${pkgver}.tar.gz 001-mingw-python.patch lzf_c.c.patch) -sha256sums=('cd4f31b19a3f16a958856655e644f28ab2e208f9e13cbddd3831161beb0baf4b' - '954b7ef4700b3d3ec713a7e813888d1e118af25c2a728467f57e7e4752b31d90' +sha256sums=('22cdc29324f39102c89542845b02241f8c5a7b180bbed8cc0b14ff72a1c0e478' + '6f586b51ea71ccb29a839d3a243b1c13f1f599d8ef6bf9854c822d09f1c1907f' '6d0126b881b5dcd637146d151341b72aa68eef760092272279072ec0bc4ceca9') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + + # https://github.com/h5py/h5py/pull/2105 patch -p1 -i ${srcdir}/001-mingw-python.patch patch -p1 -i ${srcdir}/lzf_c.c.patch