Merge branch 'develop' into t/22844/symbolic_limit

Author: rwst

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.0.beta5, Release Date: 2017-05-04
+SageMath version 8.0.beta6, Release Date: 2017-05-12

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=339f2474b789d33051dde8f69d047ae723a36379
-md5=9bb01c255b39648bb19f62a3fa24a80d
-cksum=2072910001
+sha1=6a2d4b05426a912b1589d9213760a6438105a502
+md5=4175d83db6c8a9a2a229bdbb383a923d
+cksum=2310778507

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-219
+220

build/pkgs/normaliz/checksums.ini

@@ -1,4 +1,4 @@
 tarball=normaliz-VERSION.tar.gz
-sha1=87bd2846a9132eb87ed6e9fa8cf875a0d6f5cc37
-md5=0eab32959e10b0c41b92c768ef562136
-cksum=1044635248
+sha1=81c89b5b2f8ff15d6939a3fd5822a288440f4d51
+md5=245b1c025ee45d0e2ffd3a77a585768e
+cksum=3791680398

build/pkgs/normaliz/package-version.txt

@@ -1 +1 @@
-3.1.4
+3.2.1

build/pkgs/normaliz/patches/22684_cone_reduce_memory_usage.patch

@@ -0,0 +1,12 @@
+diff -druN src/source/libnormaliz/cone.cpp patches/source/libnormaliz/cone.cpp
+--- src/source/libnormaliz/cone.cpp	2017-02-22 17:59:08.000000000 +0100
++++ patches/source/libnormaliz/cone.cpp	2017-04-26 16:33:57.460366489 +0200
+@@ -3223,7 +3223,7 @@
+     Deg1Elements=Matrix<Integer>(0,dim);
+     ModuleGenerators=Matrix<Integer>(0,dim);
+     
+-    Matrix<Integer> Raw=ApproxCone.getDeg1ElementsMatrix();
++    const Matrix<Integer>& Raw=ApproxCone.getDeg1ElementsMatrix();
+     Matrix<Integer> Result(0,dim);
+     Matrix<Integer> Eq=BasisChange.getEquations();
+     Matrix<Integer> Cong=BasisChange.getCongruences();

build/pkgs/normaliz/spkg-install

@@ -14,6 +14,3 @@ cd src
 $MAKE || die "Error building normaliz"
 $MAKE install || die "Error installing normaliz"
 
-cd Singular || die "Normaliz distribution has no Singular subdirectory"
-cp -pf normaliz.lib "$SAGE_LOCAL/share/singular/" || die "Error installing normaliz.lib for Singular."
-

build/pkgs/pynormaliz/checksums.ini

@@ -1,4 +1,4 @@
 tarball=PyNormaliz-VERSION.tar.gz
-sha1=e69046012a18f73cc820cf072d43f7d852020d49
-md5=27a5f7d3fa0d96766d4f811495b0f5ce
-cksum=1643770354
+sha1=619d2b01d9ee20bfcf880cb25ea04b72cc2d2942
+md5=22eea4624caff219618640ed67003b9d
+cksum=4251733870

build/pkgs/pynormaliz/package-version.txt

@@ -1 +1 @@
-1.0
+1.5

build/pkgs/python3/patches/3.4.5-struct.patch

@@ -3,6 +3,15 @@ as been fixed upstream for Python 3.7; see https://bugs.python.org/issue21124
 diff -r b244bf74b638 Modules/_struct.c
 --- a/Modules/_struct.c	Sun Oct 02 13:49:05 2016 +0300
 +++ b/Modules/_struct.c	Sun Oct 02 19:54:56 2016 +0900
+@@ -1627,7 +1627,7 @@ unpackiter_iternext(unpackiterobject *self)
+ }
+
+ static PyTypeObject unpackiter_type = {
+-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
++    PyVarObject_HEAD_INIT(NULL, 0)
+     "unpack_iterator",                          /* tp_name */
+     sizeof(unpackiterobject),                   /* tp_basicsize */
+     0,    
 @@ -2301,6 +2301,9 @@
      if (PyType_Ready(&PyStructType) < 0)
          return NULL;