aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorChristian Kampka <christian@kampka.net>2016-03-28 10:48:54 +0200
committerChristian Kampka <christian@kampka.net>2016-03-28 10:48:54 +0200
commit92c47eed2278e37b49d293c4bb3cc43390d41494 (patch)
tree130f76f250cad4451cb48d185eb09f05c4430d04 /testing
parentaa50c9d2c9b5368cdf3f09561484a958ff921521 (diff)
downloadaports-92c47eed2278e37b49d293c4bb3cc43390d41494.tar.bz2
aports-92c47eed2278e37b49d293c4bb3cc43390d41494.tar.xz
testing/numpy: new upstream version 1.11.0
Diffstat (limited to 'testing')
-rw-r--r--testing/py-numpy/APKBUILD18
-rw-r--r--testing/py-numpy/numpy-1.10.0-musl.patch19
-rw-r--r--testing/py-numpy/numpy-1.11.0-musl.patch9
3 files changed, 18 insertions, 28 deletions
diff --git a/testing/py-numpy/APKBUILD b/testing/py-numpy/APKBUILD
index 4e23593337..7bf76129a3 100644
--- a/testing/py-numpy/APKBUILD
+++ b/testing/py-numpy/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=py-numpy
_pkgname=numpy
-pkgver=1.10.4
-pkgrel=1
+pkgver=1.11.0
+pkgrel=0
pkgdesc="Scientific tools for Python"
url="http://numpy.scipy.org/"
arch="all"
@@ -14,7 +14,7 @@ makedepends="$depends_dev"
install=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz
- numpy-1.10.0-musl.patch
+ numpy-1.11.0-musl.patch
site.cfg"
_builddir="$srcdir"/$_pkgname-$pkgver
@@ -44,12 +44,12 @@ package() {
install -m644 LICENSE.txt "$pkgdir"/usr/share/licenses/custom/$pkgname/LICENSE
}
-md5sums="90bb9034652cefbada19cf7d141a6a61 numpy-1.10.4.tar.gz
-e00075bed14f650030a8704db7fda6ee numpy-1.10.0-musl.patch
+md5sums="bc56fb9fc2895aa4961802ffbdb31d0b numpy-1.11.0.tar.gz
+a1ad56975b7d307d7c62cfb06963322b numpy-1.11.0-musl.patch
6f15bb8fe3d12faa8983a9e18bbea2a9 site.cfg"
-sha256sums="f7f91842056a7cf680b0eaf8cefc5e46c69e2521e651128d2e6aaaccec8652ae numpy-1.10.4.tar.gz
-e4a84dab5561833299bb506acba2d1a5feea929af69bde56a10558612405f8ec numpy-1.10.0-musl.patch
+sha256sums="a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e numpy-1.11.0.tar.gz
+e94f8d85b08de300a7402c8f4c7f6badbeb88964f45890c6c1aabfed9e3e1b88 numpy-1.11.0-musl.patch
8aa71c1aec2a9fdf6ab6167c92e86bdaf27f9a263b6b9849097ec7dcdf6d91a3 site.cfg"
-sha512sums="2270fa25fb464e3bc83e009090dc6b42ed5be607ab747892cfb546aba0ce78c76c8e575fe1a21eccb6f4b1f81ab183cd919b52d6410fff7d03e767f07eb40233 numpy-1.10.4.tar.gz
-9f97a3f3e9890598444d78418cbc4aac75d06df8a10634bc94e8c346a70d3fb7efb45004cf0d5840646c7e72e2886234988ed01021b36ca87ed727470e44be75 numpy-1.10.0-musl.patch
+sha512sums="92c1889397ad013e25da3a0657fc01e787d528fc19c29cc2acd286c3f07d41b984252583457b1b9259fc303afbe9694565cdcf5752eb4ecb950cc7a99ec1ad8b numpy-1.11.0.tar.gz
+f8820c08754b5521e1a30b602bf87667459c96c1abfa78a4f54331c19ceec5e2f3108a20ba09fdf8089087296a4836dc32b2b47022efd90ade3de568aef9a1a7 numpy-1.11.0-musl.patch
21ca8db304cbbf5949f07702f2a42bb5e5a0d641921e36649555a41b0e48f04e96f53760417823177ac27f6de24b2191e6e1d5f0eb393beafa29f7484e23284f site.cfg"
diff --git a/testing/py-numpy/numpy-1.10.0-musl.patch b/testing/py-numpy/numpy-1.10.0-musl.patch
deleted file mode 100644
index 36dec388f7..0000000000
--- a/testing/py-numpy/numpy-1.10.0-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/numpy/core/src/private/npy_config.h.orig 2015-08-11 19:03:43.000000000 +0200
-+++ b/numpy/core/src/private/npy_config.h 2015-10-08 08:20:25.489203036 +0200
-@@ -71,7 +71,7 @@
-
-
- /* Disable broken gnu trig functions on linux */
--#if defined(__linux__) && defined(__GNUC__)
-+#if defined(__linux__) && defined(__GLIBC__)
-
- #if defined(HAVE_FEATURES_H)
- #include <features.h>
-@@ -96,6 +96,6 @@
- #endif
- #undef TRIG_OK
-
--#endif /* defined(__linux__) && defined(__GNUC__) */
-+#endif /* defined(__linux__) && defined(__GLIBC__) */
-
- #endif
diff --git a/testing/py-numpy/numpy-1.11.0-musl.patch b/testing/py-numpy/numpy-1.11.0-musl.patch
new file mode 100644
index 0000000000..da289f6407
--- /dev/null
+++ b/testing/py-numpy/numpy-1.11.0-musl.patch
@@ -0,0 +1,9 @@
+--- numpy-1.11.0.orig/numpy/core/src/multiarray/numpyos.c
++++ numpy-1.11.0/numpy/core/src/multiarray/numpyos.c
+@@ -15,7 +15,7 @@
+
+ #ifdef HAVE_STRTOLD_L
+ #include <stdlib.h>
+-#include <xlocale.h>
++#include <locale.h>
+ #endif