zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Version 9.1.

Browse source 
- Drop upstreamed -nauty patch.
- Drop -cbc patch; upstream uses the system Cbc now.
- Add -ecl patch for ecl 20.4.24.
This commit is contained in:
Jerry James 2020-07-10 11:04:09 -06:00
parent 4556e3ebb0
commit eb706cd5f8
15 changed files with 838 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

46
sagemath-libgap.patch
View file

@ -1,6 +1,7 @@
--- src/sage/env.py.orig 2020-01-01 04:03:10.000000000 -0700
+++ src/sage/env.py 2020-03-13 09:51:49.255840082 -0600
@@ -174,7 +174,7 @@ var('CONWAY_POLYNOMIALS_DATA_DIR', joi
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2020-05-20 16:33:41.000000000 -0600
+++ src/sage/env.py 2020-07-06 16:57:04.139002833 -0600
@@ -181,7 +181,7 @@ var('CONWAY_POLYNOMIALS_DATA_DIR', joi
var('GRAPHS_DATA_DIR', join(SAGE_SHARE, 'graphs'))
var('ELLCURVE_DATA_DIR', join(SAGE_SHARE, 'ellcurves'))
var('POLYTOPE_DATA_DIR', join(SAGE_SHARE, 'reflexive_polytopes'))
@ -9,8 +10,9 @@
var('THEBE_DIR', join(SAGE_SHARE, 'thebe'))
var('COMBINATORIAL_DESIGN_DATA_DIR', join(SAGE_SHARE, 'combinatorial_designs'))
var('CREMONA_MINI_DATA_DIR', join(SAGE_SHARE, 'cremona'))
--- src/sage/libs/gap/element.pyx.orig 2020-01-01 04:03:10.000000000 -0700
+++ src/sage/libs/gap/element.pyx 2020-03-13 10:38:15.632637753 -0600
diff -up src/sage/libs/gap/element.pyx.orig src/sage/libs/gap/element.pyx
--- src/sage/libs/gap/element.pyx.orig 2020-05-20 16:33:41.000000000 -0600
+++ src/sage/libs/gap/element.pyx 2020-07-06 16:57:04.140002833 -0600
@@ -264,7 +264,7 @@ cdef Obj make_gap_string(sage_string) ex
try:
GAP_Enter()
@ -101,20 +103,21 @@
cdef Obj obj = self.value
if isinstance(i, tuple):
--- src/sage/libs/gap/gap_includes.pxd.orig 2020-01-01 04:03:10.000000000 -0700
+++ src/sage/libs/gap/gap_includes.pxd 2020-03-13 10:32:21.845358454 -0600
@@ -12,8 +12,8 @@
diff -up src/sage/libs/gap/gap_includes.pxd.orig src/sage/libs/gap/gap_includes.pxd
--- src/sage/libs/gap/gap_includes.pxd.orig 2020-05-20 16:33:41.000000000 -0600
+++ src/sage/libs/gap/gap_includes.pxd 2020-07-06 16:58:14.358987770 -0600
@@ -13,8 +13,8 @@ from libc.stdint cimport uintptr_t, uint
cdef extern from "gap/system.h" nogil:
ctypedef char Char
- ctypedef int Int
- ctypedef unsigned int UInt
- ctypedef uintptr_t UInt
+ ctypedef long Int
+ ctypedef unsigned long UInt
ctypedef void* Obj
@@ -24,8 +24,8 @@ cdef extern from "gap/ariths.h" nogil:
ctypedef uint8_t UInt1
ctypedef uint16_t UInt2
ctypedef uint32_t UInt4
@@ -29,8 +29,8 @@ cdef extern from "gap/ariths.h" nogil:
Obj QUO(Obj, Obj)
Obj POW(Obj, Obj)
Obj MOD(Obj, Obj)
@ -125,7 +128,7 @@
cdef extern from "gap/bool.h" nogil:
@@ -34,7 +34,7 @@ cdef extern from "gap/bool.h" nogil:
@@ -39,7 +39,7 @@ cdef extern from "gap/bool.h" nogil:
cdef extern from "gap/calls.h" nogil:
@ -134,7 +137,7 @@
Obj CALL_0ARGS(Obj f) # 0 arguments
Obj CALL_1ARGS(Obj f, Obj a1) # 1 argument
Obj CALL_2ARGS(Obj f, Obj a1, Obj a2)
@@ -56,7 +56,7 @@ cdef extern from "gap/gasman_intern.h" n
@@ -61,7 +61,7 @@ cdef extern from "gap/gasman_intern.h" n
cdef extern from "gap/gvars.h" nogil:
@ -143,7 +146,7 @@
void AssGVar "AssGVar"(UInt gvar, Obj val)
@@ -65,7 +65,7 @@ cdef extern from "gap/integer.h" nogil:
@@ -70,7 +70,7 @@ cdef extern from "gap/integer.h" nogil:
cdef extern from "gap/intobj.h" nogil:
@ -152,7 +155,7 @@
Obj INTOBJ_INT(Int)
Int INT_INTOBJ(Obj)
@@ -95,11 +95,11 @@ cdef extern from "gap/libgap-api.h" nogi
@@ -100,11 +100,11 @@ cdef extern from "gap/libgap-api.h" nogi
cdef extern from "gap/lists.h" nogil:
@ -169,7 +172,7 @@
cdef extern from "gap/listfunc.h" nogil:
@@ -111,13 +111,13 @@ cdef extern from "gap/macfloat.h" nogil:
@@ -116,13 +116,13 @@ cdef extern from "gap/macfloat.h" nogil:
cdef extern from "gap/objects.h" nogil:
@ -186,7 +189,7 @@
cdef enum TNUM:
T_INT
@@ -147,23 +147,23 @@ cdef extern from "gap/objects.h" nogil:
@@ -163,23 +163,23 @@ cdef extern from "gap/permutat.h" nogil:
cdef extern from "gap/precord.h" nogil:
@ -221,8 +224,9 @@
+ Int IsStringConv(Obj obj)
+ Obj NEW_STRING(Int len)
+ Obj MakeStringWithLen(const char *buf, size_t len)
--- src/sage/libs/gap/util.pyx.orig 2020-01-01 04:03:10.000000000 -0700
+++ src/sage/libs/gap/util.pyx 2020-03-13 10:23:13.675207968 -0600
diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
--- src/sage/libs/gap/util.pyx.orig 2020-05-20 16:33:41.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2020-07-06 16:57:04.142002832 -0600
@@ -386,7 +386,7 @@ cdef Obj gap_eval(str gap_string) except
"""
initialize()