[arch-commits] Commit in sagemath/trunk (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Mar 9 13:48:17 UTC 2019
Date: Saturday, March 9, 2019 @ 13:48:16
Author: arojas
Revision: 438247
GAP 4.10.1 rebuild
Added:
sagemath/trunk/sagemath-gap-4.10.1.patch
sagemath/trunk/sagemath-singular-4.1.2.patch
(from rev 438246, sagemath/trunk/sagemath-singular-4.1.1.p4.patch)
Modified:
sagemath/trunk/PKGBUILD
Deleted:
sagemath/trunk/sagemath-singular-4.1.1.p4.patch
----------------------------------+
PKGBUILD | 18 +++---
sagemath-gap-4.10.1.patch | 31 +++++++++++
sagemath-singular-4.1.1.p4.patch | 78 ----------------------------
sagemath-singular-4.1.2.patch | 102 +++++++++++++++++++++++++++++++++++++
4 files changed, 144 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-09 13:39:42 UTC (rev 438246)
+++ PKGBUILD 2019-03-09 13:48:16 UTC (rev 438247)
@@ -8,7 +8,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=8.6
-pkgrel=5
+pkgrel=6
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
arch=(x86_64)
url="http://www.sagemath.org"
@@ -45,9 +45,10 @@
sagemath-cremona.patch
sagemath-sphinx-1.8.patch
sagemath-cypari2.patch
- sagemath-singular-4.1.1.p4.patch
+ sagemath-singular-4.1.2.patch
sagemath-ecl-sigfpe.patch
- sagemath-numpy-1.16.patch)
+ sagemath-numpy-1.16.patch
+ sagemath-gap-4.10.1.patch)
sha256sums=('dea613fc955cada76aaa7ab379bc5a219fe8b496064824f8c798b2b1651442fa'
'de6e38462ef1848778fbc23a63529fbee9229dbb245bb653f58a0d834a634c04'
'960afe4fcbffe2762b66119b8f14355386ced0d8ee52b535d0dac1dba90d365b'
@@ -59,9 +60,10 @@
'4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96'
'22f5e44a42c8276025b8512f45cac1c36d576c29c7fd9d36fde8b19ff87867d8'
'ca47248d2ed5edfe663ea02e261ddbb26a7cb03bef67928dbec690d9b9a8f129'
- '482887fe43d89cef3270e89300ab9e2238fa74cd5b7c875688b68fb1b10c4fdf'
+ '961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9'
'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
- 'd483b1dc78eb83e3cd1620e3d44214ca0704065e1d27d7a257976e56c85f2d5b')
+ 'd483b1dc78eb83e3cd1620e3d44214ca0704065e1d27d7a257976e56c85f2d5b'
+ 'ea7148347107ad90306c51c66b2fe522e1e99abed0546b7780b1b346261929bc')
prepare(){
cd sage-$pkgver
@@ -81,6 +83,8 @@
patch -p1 -i ../sagemath-threejs.patch
# fix introspection with sphinx 1.8
patch -p1 -i ../sagemath-sphinx-1.8.patch
+# port to GAP 4.10.1 API changes
+ patch -p1 -i ../sagemath-gap-4.10.1.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -89,8 +93,8 @@
patch -p1 -i ../sagemath-cremona.patch
# Fix build with cypari 2.0 https://trac.sagemath.org/ticket/26442
patch -p1 -i ../sagemath-cypari2.patch
-# Fixes for singular 4.1.1p4 https://trac.sagemath.org/ticket/25993
- patch -p1 -i ../sagemath-singular-4.1.1.p4.patch
+# Fixes for singular 4.1.2 https://trac.sagemath.org/ticket/25993
+ patch -p1 -i ../sagemath-singular-4.1.2.patch
# Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
patch -p1 -i ../sagemath-ecl-sigfpe.patch
# Fix inline fortran with numpy 1.16 https://trac.sagemath.org/ticket/27061
Added: sagemath-gap-4.10.1.patch
===================================================================
--- sagemath-gap-4.10.1.patch (rev 0)
+++ sagemath-gap-4.10.1.patch 2019-03-09 13:48:16 UTC (rev 438247)
@@ -0,0 +1,31 @@
+diff --git a/src/sage/libs/gap/gap_includes.pxd b/src/sage/libs/gap/gap_includes.pxd
+index 864a13b385..8a2c22ed4a 100644
+--- a/src/sage/libs/gap/gap_includes.pxd
++++ b/src/sage/libs/gap/gap_includes.pxd
+@@ -77,8 +77,8 @@ cdef extern from "<gap/io.h>":
+
+ cdef extern from "<gap/libgap-api.h>":
+ ctypedef void (*CallbackFunc)()
+- void GAP_Initialize(int argc, char ** argv, char ** env,
+- CallbackFunc, CallbackFunc)
++ void GAP_Initialize(int argc, char ** argv,
++ CallbackFunc, CallbackFunc, int handleSignals)
+ Obj GAP_EvalString(const char *) except *
+ Obj GAP_EvalStringNoExcept "GAP_EvalString"(const char *)
+ Obj GAP_ValueGlobalVariable(const char *)
+diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
+index 97c383fdbe..20ecc82976 100644
+--- a/src/sage/libs/gap/util.pyx
++++ b/src/sage/libs/gap/util.pyx
+@@ -320,8 +320,8 @@
+ # Need to save/restore current SIGINT handling since GAP_Initialize
+ # currently clobbers it; it doesn't matter what we set SIGINT to
+ # temporarily.
+- GAP_Initialize(argc, argv, env, &gasman_callback,
+- &error_handler)
++ GAP_Initialize(argc, argv, &gasman_callback,
++ &error_handler, 1)
+ except RuntimeError as msg:
+ raise RuntimeError('libGAP initialization failed\n' + msg)
+ finally:
+
Deleted: sagemath-singular-4.1.1.p4.patch
===================================================================
--- sagemath-singular-4.1.1.p4.patch 2019-03-09 13:39:42 UTC (rev 438246)
+++ sagemath-singular-4.1.1.p4.patch 2019-03-09 13:48:16 UTC (rev 438247)
@@ -1,78 +0,0 @@
-diff --git a/src/sage/libs/singular/function.pyx b/src/sage/libs/singular/function.pyx
-index 87342e8..9a0d37d 100644
---- a/src/sage/libs/singular/function.pyx
-+++ b/src/sage/libs/singular/function.pyx
-@@ -1258,7 +1258,7 @@ cdef class SingularFunction(SageObject):
- Traceback (most recent call last):
- ...
- RuntimeError: error in Singular function call 'size':
-- Wrong number of arguments (got 2 arguments, arity code is 300)
-+ Wrong number of arguments (got 2 arguments, arity code is 302)
- sage: size('foobar', ring=P)
- 6
-
-@@ -1667,17 +1667,17 @@ def singular_function(name):
- Traceback (most recent call last):
- ...
- RuntimeError: error in Singular function call 'factorize':
-- Wrong number of arguments (got 0 arguments, arity code is 303)
-+ Wrong number of arguments (got 0 arguments, arity code is 305)
- sage: factorize(f, 1, 2)
- Traceback (most recent call last):
- ...
- RuntimeError: error in Singular function call 'factorize':
-- Wrong number of arguments (got 3 arguments, arity code is 303)
-+ Wrong number of arguments (got 3 arguments, arity code is 305)
- sage: factorize(f, 1, 2, 3)
- Traceback (most recent call last):
- ...
- RuntimeError: error in Singular function call 'factorize':
-- Wrong number of arguments (got 4 arguments, arity code is 303)
-+ Wrong number of arguments (got 4 arguments, arity code is 305)
-
- The Singular function ``list`` can be called with any number of
- arguments::
-diff --git a/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx b/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx
-index 8f6576b477..deaf0f5769 100644
---- a/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx
-+++ b/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx
-@@ -447,7 +447,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
- return True
- for i from 0 <= i < p_d-s_d:
- s_poly = singular_system("stest",s_poly,1,
-- A._degbound,A.__ngens,ring=P)
-+ ring=P)
- if P.monomial_divides(s_poly,p_poly):
- return True
- return False
-@@ -601,7 +601,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
- # we must put the polynomials into the same ring
- left._poly = A._current_ring(left._poly)
- right._poly = A._current_ring(right._poly)
-- rshift = singular_system("stest",right._poly,left._poly.degree(),A._degbound,A.__ngens, ring=A._current_ring)
-+ rshift = singular_system("stest",right._poly,left._poly.degree(), ring=A._current_ring)
- return FreeAlgebraElement_letterplace(A,left._poly*rshift, check=False)
-
- def __pow__(FreeAlgebraElement_letterplace self, int n, k):
-@@ -629,7 +629,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
- q = p = self._poly
- cdef int i
- for i from 0<i<n:
-- q = singular_system("stest",q,d,A._degbound,A.__ngens,
-+ q = singular_system("stest",q,d,
- ring=A._current_ring)
- p *= q
- return FreeAlgebraElement_letterplace(A, p, check=False)
-diff --git a/src/sage/algebras/letterplace/free_algebra_letterplace.pyx b/src/sage/algebras/letterplace/free_algebra_letterplace.pyx
-index 7a8400052e..b3474fa07c 100644
---- a/src/sage/algebras/letterplace/free_algebra_letterplace.pyx
-+++ b/src/sage/algebras/letterplace/free_algebra_letterplace.pyx
-@@ -683,7 +683,7 @@ cdef class FreeAlgebra_letterplace(Algebra):
- degbound = self._degbound
- cdef list G = [C(x._poly) for x in g]
- for y in G:
-- out.extend([y]+[singular_system("stest",y,n+1,degbound,ngens,ring=C) for n in xrange(d-y.degree())])
-+ out.extend([y]+[singular_system("stest",y,n+1,ring=C) for n in xrange(d-y.degree())])
- return C.ideal(out)
-
- ###########################
Copied: sagemath/trunk/sagemath-singular-4.1.2.patch (from rev 438246, sagemath/trunk/sagemath-singular-4.1.1.p4.patch)
===================================================================
--- sagemath-singular-4.1.2.patch (rev 0)
+++ sagemath-singular-4.1.2.patch 2019-03-09 13:48:16 UTC (rev 438247)
@@ -0,0 +1,102 @@
+diff --git a/src/sage/libs/singular/function.pyx b/src/sage/libs/singular/function.pyx
+index 87342e8..9a0d37d 100644
+--- a/src/sage/libs/singular/function.pyx
++++ b/src/sage/libs/singular/function.pyx
+@@ -1258,7 +1258,7 @@ cdef class SingularFunction(SageObject):
+ Traceback (most recent call last):
+ ...
+ RuntimeError: error in Singular function call 'size':
+- Wrong number of arguments (got 2 arguments, arity code is 300)
++ Wrong number of arguments (got 2 arguments, arity code is 302)
+ sage: size('foobar', ring=P)
+ 6
+
+@@ -1667,17 +1667,17 @@ def singular_function(name):
+ Traceback (most recent call last):
+ ...
+ RuntimeError: error in Singular function call 'factorize':
+- Wrong number of arguments (got 0 arguments, arity code is 303)
++ Wrong number of arguments (got 0 arguments, arity code is 305)
+ sage: factorize(f, 1, 2)
+ Traceback (most recent call last):
+ ...
+ RuntimeError: error in Singular function call 'factorize':
+- Wrong number of arguments (got 3 arguments, arity code is 303)
++ Wrong number of arguments (got 3 arguments, arity code is 305)
+ sage: factorize(f, 1, 2, 3)
+ Traceback (most recent call last):
+ ...
+ RuntimeError: error in Singular function call 'factorize':
+- Wrong number of arguments (got 4 arguments, arity code is 303)
++ Wrong number of arguments (got 4 arguments, arity code is 305)
+
+ The Singular function ``list`` can be called with any number of
+ arguments::
+diff --git a/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx b/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx
+index 8f6576b477..deaf0f5769 100644
+--- a/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx
++++ b/src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx
+@@ -447,7 +447,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
+ return True
+ for i from 0 <= i < p_d-s_d:
+ s_poly = singular_system("stest",s_poly,1,
+- A._degbound,A.__ngens,ring=P)
++ ring=P)
+ if P.monomial_divides(s_poly,p_poly):
+ return True
+ return False
+@@ -601,7 +601,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
+ # we must put the polynomials into the same ring
+ left._poly = A._current_ring(left._poly)
+ right._poly = A._current_ring(right._poly)
+- rshift = singular_system("stest",right._poly,left._poly.degree(),A._degbound,A.__ngens, ring=A._current_ring)
++ rshift = singular_system("stest",right._poly,left._poly.degree(), ring=A._current_ring)
+ return FreeAlgebraElement_letterplace(A,left._poly*rshift, check=False)
+
+ def __pow__(FreeAlgebraElement_letterplace self, int n, k):
+@@ -629,7 +629,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
+ q = p = self._poly
+ cdef int i
+ for i from 0<i<n:
+- q = singular_system("stest",q,d,A._degbound,A.__ngens,
++ q = singular_system("stest",q,d,
+ ring=A._current_ring)
+ p *= q
+ return FreeAlgebraElement_letterplace(A, p, check=False)
+diff --git a/src/sage/algebras/letterplace/free_algebra_letterplace.pyx b/src/sage/algebras/letterplace/free_algebra_letterplace.pyx
+index 7a8400052e..b3474fa07c 100644
+--- a/src/sage/algebras/letterplace/free_algebra_letterplace.pyx
++++ b/src/sage/algebras/letterplace/free_algebra_letterplace.pyx
+@@ -683,7 +683,7 @@ cdef class FreeAlgebra_letterplace(Algebra):
+ degbound = self._degbound
+ cdef list G = [C(x._poly) for x in g]
+ for y in G:
+- out.extend([y]+[singular_system("stest",y,n+1,degbound,ngens,ring=C) for n in xrange(d-y.degree())])
++ out.extend([y]+[singular_system("stest",y,n+1,ring=C) for n in xrange(d-y.degree())])
+ return C.ideal(out)
+
+ ###########################
+diff --git a/src/sage/algebras/letterplace/letterplace_ideal.pyx b/src/sage/algebras/letterplace/letterplace_ideal.pyx
+index 5776c58cf7..e4ad267bd4 100644
+--- a/src/sage/algebras/letterplace/letterplace_ideal.pyx
++++ b/src/sage/algebras/letterplace/letterplace_ideal.pyx
+@@ -48,7 +48,7 @@ from sage.rings.infinity import Infinity
+ #####################
+ # Define some singular functions
+ lib("freegb.lib")
+-singular_system=singular_function("system")
++singular_std=singular_function("std")
+ poly_reduce=singular_function("NF")
+
+ class LetterplaceIdeal(Ideal_nc):
+@@ -276,8 +276,7 @@ class LetterplaceIdeal(Ideal_nc):
+ A.set_degbound(degbound)
+ P = A._current_ring
+ out = [FreeAlgebraElement_letterplace(A,X,check=False) for X in
+- singular_system("freegb",P.ideal([x._poly for x in self.__GB.gens()]),
+- degbound,A.__ngens, ring = P)]
++ singular_std(P.ideal([x._poly for x in self.__GB.gens()]), ring = P)]
+ libsingular_options['redTail'] = bck[0]
+ libsingular_options['redSB'] = bck[1]
+ self.__GB = A.ideal(out,side='twosided',coerce=False)
+
More information about the arch-commits
mailing list