diff --git a/mingw-w64-python-numpy/0001-detect-mingw-environment.patch b/mingw-w64-python-numpy/0001-detect-mingw-environment.patch index 326ab058d0..047ccd7825 100644 --- a/mingw-w64-python-numpy/0001-detect-mingw-environment.patch +++ b/mingw-w64-python-numpy/0001-detect-mingw-environment.patch @@ -1,7 +1,7 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/misc_util.py numpy-1.10.2/numpy/distutils/misc_util.py --- numpy-1.10.2.orig/numpy/distutils/misc_util.py 2016-01-04 00:38:06.433855300 +0000 +++ numpy-1.10.2/numpy/distutils/misc_util.py 2016-01-04 00:40:27.356823400 +0000 -@@ -386,6 +386,10 @@ +@@ -396,6 +396,10 @@ return True if os.environ.get('MSYSTEM', '')=='MINGW32': return True diff --git a/mingw-w64-python-numpy/0002-fix-finding-python2.patch b/mingw-w64-python-numpy/0002-fix-finding-python2.patch index 5a24e526a7..ca8dd88f3a 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.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 @@ +@@ -97,22 +97,24 @@ elif self.linker_dll == 'gcc': self.linker = 'g++' @@ -43,7 +43,7 @@ diff -urN numpy-1.13.0.orig/numpy/distutils/mingw32ccompiler.py numpy-1.13.0/num diff -urN numpy-1.10.2.orig/numpy/distutils/fcompiler/gnu.py numpy-1.10.2/numpy/distutils/fcompiler/gnu.py --- numpy-1.10.2.orig/numpy/distutils/fcompiler/gnu.py 2015-11-12 20:04:51.000000000 +0000 +++ numpy-1.10.2/numpy/distutils/fcompiler/gnu.py 2016-01-02 03:36:30.528498700 +0000 -@@ -101,7 +101,7 @@ +@@ -108,7 +108,7 @@ pic_flags = ['-fPIC'] # use -mno-cygwin for g77 when Python is not Cygwin-Python diff --git a/mingw-w64-python-numpy/0004-fix-testsuite.patch b/mingw-w64-python-numpy/0004-fix-testsuite.patch index f1f95e94e3..7bcdad5af0 100644 --- a/mingw-w64-python-numpy/0004-fix-testsuite.patch +++ b/mingw-w64-python-numpy/0004-fix-testsuite.patch @@ -1,6 +1,6 @@ --- numpy-1.9.0/numpy/core/tests/test_multiarray.py.orig 2014-09-07 10:57:48.000000000 +0200 +++ numpy-1.9.0/numpy/core/tests/test_multiarray.py 2014-09-22 20:42:55.177362800 +0200 -@@ -3367,7 +3367,7 @@ +@@ -4708,7 +4708,7 @@ """Test workarounds for 32-bit limited fwrite, fseek, and ftell calls in windows. These normally would hang doing something like this. See http://projects.scipy.org/numpy/ticket/1660""" diff --git a/mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch b/mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch index f17aabb73f..5def1f1cb1 100644 --- a/mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch +++ b/mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.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 2016-01-02 03:57:55.666397000 +0000 +++ numpy-1.10.2/numpy/distutils/mingw32ccompiler.py 2016-01-02 03:54:51.695638100 +0000 -@@ -120,10 +120,12 @@ +@@ -131,10 +131,12 @@ else: # gcc-4 series releases do not support -mno-cygwin option self.set_executables( @@ -18,7 +18,7 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/num else: if self.gcc_version <= "3.0.0": self.set_executables( -@@ -142,10 +144,16 @@ +@@ -155,10 +155,16 @@ linker_so='g++ -mno-cygwin -shared') else: # gcc-4 series releases do not support -mno-cygwin option diff --git a/mingw-w64-python-numpy/0007-disable-64bit-experimental-warning.patch b/mingw-w64-python-numpy/0007-disable-64bit-experimental-warning.patch index 35c0c9c08b..44e891b040 100644 --- a/mingw-w64-python-numpy/0007-disable-64bit-experimental-warning.patch +++ b/mingw-w64-python-numpy/0007-disable-64bit-experimental-warning.patch @@ -1,7 +1,7 @@ diff -urN numpy-1.10.2.orig/numpy/core/src/multiarray/multiarraymodule.c numpy-1.10.2/numpy/core/src/multiarray/multiarraymodule.c --- numpy-1.10.2.orig/numpy/core/src/multiarray/multiarraymodule.c 2015-11-12 13:04:51.000000000 -0700 +++ numpy-1.10.2/numpy/core/src/multiarray/multiarraymodule.c 2016-03-30 06:20:16.617824700 -0700 -@@ -4476,15 +4476,6 @@ +@@ -4556,15 +4556,6 @@ goto err; } diff --git a/mingw-w64-python-numpy/0008-detect-mingw-environment2.patch b/mingw-w64-python-numpy/0008-detect-mingw-environment2.patch deleted file mode 100644 index 9576510c05..0000000000 --- a/mingw-w64-python-numpy/0008-detect-mingw-environment2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- numpy-orig/numpy/core/setup.py 2018-04-25 23:12:01.000000000 +0200 -+++ numpy/numpy/core/setup.py 2018-05-25 21:58:05.675465800 +0200 -@@ -688,7 +688,7 @@ - ] - - # Must be true for CRT compilers but not MinGW/cygwin. See gh-9977. -- is_msvc = platform.system() == 'Windows' -+ is_msvc = platform.system() == 'Windows' and not 'GCC' in sys.version - config.add_installed_library('npymath', - sources=npymath_sources + [get_mathlib_info], - install_dir='lib', diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD index 79f1ec9f51..b6baa665d5 100644 --- a/mingw-w64-python-numpy/PKGBUILD +++ b/mingw-w64-python-numpy/PKGBUILD @@ -5,7 +5,7 @@ _realname=numpy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.16.2 +pkgver=1.16.3 pkgrel=1 pkgdesc="Scientific tools for Python (mingw-w64)" arch=('any') @@ -27,14 +27,14 @@ source=(https://github.com/numpy/numpy/releases/download/v${pkgver}/${_realname} 0006-disable-visualcompaq-for-mingw.patch 0007-disable-64bit-experimental-warning.patch 0008-detect-mingw-environment2.patch) -sha256sums=('8088221e6e27da8d5907729f0bfe798f526836f22cc59ae83a0f867e67416a3e' - '94e48602f59a69a9d56886e5b1dab62ffc4fb30b00c5d62d2a818d67d4fd079a' - 'cbe3c59fe4a4182112c88070ff8dbea8198a5d4f7c43336621eb352d475b171b' +sha256sums=('adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f' + '173e9020eb88a9b281180024ad0f137f86f893e2099693693e42a5bf5944381a' + '140c23c214cae880833380e8479e4ce45c8439b22b1432d73ff0cc2cd58da886' '3b640625b56b158465d6628f75fadce90af8825259d04af1b1af09fef53a720c' - '1f9783c356196327a424113e9a5d39c04fc70fef5529fd0d43288ff5274494f4' - '429d3379e6840dd39763c629488a687a04dc3c4540e58565e75f9809e57f778d' + '720fbba58ac6a73e9476266d033ada9bdc809ec5a6c3cd518fc2f1efec34c3f9' + '3cc0176440f4f474612cb3c28b94d0846b74b508631b399aec0a5c0943c4cf1a' 'e8f2c52131e79a4e36c98f499efa85bc56254e577fae11ebce0093422114a306' - '00eac381f73172cb03f54fc71a845a3e72a998d78e88cbce752cf52672fc6bd1' + 'c1114a027fc797bb6c5c6f7b3044fa853b9e9263555088b4b2b12bdb77baefd5' '5f59d7f0435af8933cd66659599d277cedfb499e036b7a3e4391db6ddd08dd72') prepare() { @@ -48,7 +48,6 @@ prepare() { patch -Np1 -i ${srcdir}/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch patch -Np1 -i ${srcdir}/0006-disable-visualcompaq-for-mingw.patch patch -Np1 -i ${srcdir}/0007-disable-64bit-experimental-warning.patch - patch -Np1 -i ${srcdir}/0008-detect-mingw-environment2.patch cd .. cp -a ${_realname}-${pkgver} ${_realname}-py2-${CARCH}