From 583d6b75d0f8bfb9a63d6f64b69861ad1ad9087e Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sat, 17 Jun 2017 19:08:22 +0300 Subject: [PATCH] python-numpy: Update to 0.13.0 --- .../0002-fix-finding-python2.patch | 18 ++++++++++-------- .../0006-disable-visualcompaq-for-mingw.patch | 12 ------------ mingw-w64-python-numpy/PKGBUILD | 12 ++++++------ 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/mingw-w64-python-numpy/0002-fix-finding-python2.patch b/mingw-w64-python-numpy/0002-fix-finding-python2.patch index f30e2af4ce..5a24e526a7 100644 --- a/mingw-w64-python-numpy/0002-fix-finding-python2.patch +++ b/mingw-w64-python-numpy/0002-fix-finding-python2.patch @@ -1,7 +1,7 @@ -diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/numpy/distutils/mingw32ccompiler.py ---- numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py 2015-11-12 20:04:51.000000000 +0000 -+++ numpy-1.10.2/numpy/distutils/mingw32ccompiler.py 2016-01-02 03:35:27.818684200 +0000 -@@ -87,21 +87,23 @@ +diff -urN numpy-1.13.0.orig/numpy/distutils/mingw32ccompiler.py numpy-1.13.0/numpy/distutils/mingw32ccompiler.py +--- numpy-1.13.0.orig/numpy/distutils/mingw32ccompiler.py 2015-11-12 20:04:51.000000000 +0000 ++++ numpy-1.13.0/numpy/distutils/mingw32ccompiler.py 2016-01-02 03:35:27.818684200 +0000 +@@ -98,22 +98,24 @@ elif self.linker_dll == 'gcc': self.linker = 'g++' @@ -21,8 +21,9 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/num - self.define_macro('NPY_MINGW_USE_CUSTOM_MSVCR') - - # Define the MSVC version as hint for MinGW -- msvcr_version = '0x%03i0' % int(msvc_runtime_library().lstrip('msvcr')) -- self.define_macro('__MSVCRT_VERSION__', msvcr_version) +- msvcr_version = msvc_runtime_version() +- if msvcr_version: +- self.define_macro('__MSVCRT_VERSION__', '0x%04i' % msvcr_version) + build_import_library() + + # Check for custom msvc runtime library on Windows. Build if it doesn't exist. @@ -33,8 +34,9 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/num + self.define_macro('NPY_MINGW_USE_CUSTOM_MSVCR') + + # Define the MSVC version as hint for MinGW -+ msvcr_version = '0x%03i0' % int(msvc_runtime_library().lstrip('msvcr')) -+ self.define_macro('__MSVCRT_VERSION__', msvcr_version) ++ msvcr_version = msvc_runtime_version() ++ if msvcr_version: ++ self.define_macro('__MSVCRT_VERSION__', '0x%04i' % msvcr_version) # MS_WIN64 should be defined when building for amd64 on windows, # but python headers define it only for MS compilers, which has all diff --git a/mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch b/mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch index a4c7f94ec6..ea04bc9a46 100644 --- a/mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch +++ b/mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch @@ -10,15 +10,3 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/fcompiler/compaq.py numpy-1.10.2/num # Otherwise we'd get a false positive on posix systems with # case-insensitive filesystems (like darwin), because we'll pick # up /bin/df -diff -aur numpy-1.11.2/numpy/distutils/msvccompiler.py.orig numpy-1.11.2/numpy/distutils/msvccompiler.py ---- numpy-1.11.2/numpy/distutils/msvccompiler.py.orig 2016-12-12 14:41:40.479160800 -0500 -+++ numpy-1.11.2/numpy/distutils/msvccompiler.py 2016-12-12 14:45:23.036996800 -0500 -@@ -47,7 +47,7 @@ - # by MSVCCompiler.initialize, so save them for later merge. - environ_lib = os.getenv('lib', '') - environ_include = os.getenv('include', '') -- _MSVCCompiler.initialize(self, plat_name) -+ _MSVCCompiler.initialize(self) - - # Merge current and previous values of 'lib' and 'include' - os.environ['lib'] = _merge(environ_lib, os.environ['lib']) diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD index 3a1ee4ccd6..9110a37512 100644 --- a/mingw-w64-python-numpy/PKGBUILD +++ b/mingw-w64-python-numpy/PKGBUILD @@ -5,8 +5,8 @@ _realname=numpy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.11.2 -pkgrel=2 +pkgver=1.13.0 +pkgrel=1 pkgdesc="Scientific tools for Python (mingw-w64)" arch=('any') license=('BSD') @@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-python2-nose" "${MINGW_PACKAGE_PREFIX}-gcc-fortran") #options=('!strip' 'debug') -source=(https://downloads.sourceforge.net/numpy/${_realname}-${pkgver}.tar.gz +source=(https://github.com/numpy/numpy/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz 0001-detect-mingw-environment.patch 0002-fix-finding-python2.patch 0003-gfortran-better-version-check.patch @@ -26,13 +26,13 @@ source=(https://downloads.sourceforge.net/numpy/${_realname}-${pkgver}.tar.gz 0005-mincoming-stack-boundary-32bit-optimized-64bit.patch 0006-disable-visualcompaq-for-mingw.patch 0007-disable-64bit-experimental-warning.patch) -sha256sums=('04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69' +sha256sums=('779dd7846dd1d864eb1e239916d25ec57c4889ad92de8ab364306bed84b7237f' '94e48602f59a69a9d56886e5b1dab62ffc4fb30b00c5d62d2a818d67d4fd079a' - 'f3864b418791d6f6c1f5a8800c955402934188bdae0614d9e49b1c84f23690d9' + 'cbe3c59fe4a4182112c88070ff8dbea8198a5d4f7c43336621eb352d475b171b' '77c342fbb13de981d682bdc1889709d9d2507a1566d5ee63004f0b764a62a988' '1f9783c356196327a424113e9a5d39c04fc70fef5529fd0d43288ff5274494f4' '429d3379e6840dd39763c629488a687a04dc3c4540e58565e75f9809e57f778d' - '4a783052aa25ee152f20ad0b2280ff1292c5dd141dc16e649f337fe8bdadb07c' + 'e8f2c52131e79a4e36c98f499efa85bc56254e577fae11ebce0093422114a306' '00eac381f73172cb03f54fc71a845a3e72a998d78e88cbce752cf52672fc6bd1') prepare() {