From fcfb2d9a9618c89c2eeec3d14655068f20e7ad4d Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 28 Oct 2019 08:07:49 +0300 Subject: [PATCH] python-h5py: Update to 2.10.0 --- mingw-w64-python-h5py/001-mingw-python.patch | 17 +++++++++++++++++ mingw-w64-python-h5py/PKGBUILD | 9 ++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/mingw-w64-python-h5py/001-mingw-python.patch b/mingw-w64-python-h5py/001-mingw-python.patch index ea67499c89..9ea7d0d86e 100644 --- a/mingw-w64-python-h5py/001-mingw-python.patch +++ b/mingw-w64-python-h5py/001-mingw-python.patch @@ -23,3 +23,20 @@ COMPILER_SETTINGS['include_dirs'].append(localpath('windows')) COMPILER_SETTINGS['define_macros'].extend([ ('_HDF5USEDLL_', None), +--- h5py-2.10.0/setup_configure.py.orig 2019-10-28 06:39:22.882866000 +0300 ++++ h5py-2.10.0/setup_configure.py 2019-10-28 06:45:46.958833800 +0300 +@@ -200,8 +200,12 @@ + regexp = re.compile(r'^libhdf5.dylib') + elif sys.platform.startswith('win') or \ + sys.platform.startswith('cygwin'): +- default_path = 'hdf5.dll' +- regexp = re.compile(r'^hdf5.dll') ++ if 'GCC' in sys.version: ++ default_path = 'libhdf5-0.dll' ++ regexp = re.compile(r'^libhdf5-[0-9].dll') ++ else: ++ default_path = 'hdf5.dll' ++ regexp = re.compile(r'^hdf5.dll') + else: + default_path = 'libhdf5.so' + regexp = re.compile(r'^libhdf5.so') diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD index 0f9aa23b1b..326b7c8fcd 100644 --- a/mingw-w64-python-h5py/PKGBUILD +++ b/mingw-w64-python-h5py/PKGBUILD @@ -4,7 +4,7 @@ _realname=h5py pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=2.9.0 +pkgver=2.10.0 pkgrel=1 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)" arch=('any') @@ -19,12 +19,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-hdf5" "${MINGW_PACKAGE_PREFIX}-pkg-config") -source=(https://files.pythonhosted.org/packages/source/h/${_realname}/${_realname}-${pkgver}.tar.gz{,.asc} +source=(https://github.com/h5py/h5py/releases/download/${pkgver}/h5py-${pkgver}.tar.gz 001-mingw-python.patch lzf_c.c.patch) -sha256sums=('9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002' - 'SKIP' - '0a841ece7c08dbc5acdf247b3e73f3e1ca346940394a7a06ee30e8055189ce46' +sha256sums=('84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d' + 'cd8dff9d11117521cc7948400fa92cbc115d432c93aac181a20017d27e3f197e' '6d0126b881b5dcd637146d151341b72aa68eef760092272279072ec0bc4ceca9') prepare() {