Version 9.3.

- Drop -arb and -openblas patches.
- Add -cvxopt patch.
- Add metainfo file.
This commit is contained in:
Jerry James 2021-06-18 11:37:21 -06:00
parent 26b688d416
commit 0a1b42ef2b
21 changed files with 1096 additions and 1037 deletions

View file

@ -1,18 +1,18 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2020-10-30 15:44:29.575821493 -0600
+++ src/sage/env.py 2020-10-30 16:09:54.834029866 -0600
@@ -182,7 +182,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'))
-var('GAP_ROOT_DIR', join(SAGE_SHARE, 'gap'))
+var('GAP_ROOT_DIR', join('/usr','lib','gap'))
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/env.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/env.py 2021-06-02 17:13:07.387813291 -0600
@@ -194,7 +194,7 @@ CONWAY_POLYNOMIALS_DATA_DIR = var("CONWA
GRAPHS_DATA_DIR = var("GRAPHS_DATA_DIR", join(SAGE_SHARE, "graphs"))
ELLCURVE_DATA_DIR = var("ELLCURVE_DATA_DIR", join(SAGE_SHARE, "ellcurves"))
POLYTOPE_DATA_DIR = var("POLYTOPE_DATA_DIR", join(SAGE_SHARE, "reflexive_polytopes"))
-GAP_ROOT_DIR = var("GAP_ROOT_DIR", join(SAGE_SHARE, "gap"))
+GAP_ROOT_DIR = var("GAP_ROOT_DIR", join('/usr', 'lib', "gap"))
THEBE_DIR = var("THEBE_DIR", join(SAGE_SHARE, "thebe"))
COMBINATORIAL_DESIGN_DATA_DIR = var("COMBINATORIAL_DESIGN_DATA_DIR", join(SAGE_SHARE, "combinatorial_designs"))
CREMONA_MINI_DATA_DIR = var("CREMONA_MINI_DATA_DIR", join(SAGE_SHARE, "cremona"))
diff -up src/sage/libs/gap/element.pyx.orig src/sage/libs/gap/element.pyx
--- src/sage/libs/gap/element.pyx.orig 2020-10-24 11:37:59.000000000 -0600
+++ src/sage/libs/gap/element.pyx 2020-10-30 14:42:23.392975217 -0600
--- src/sage/libs/gap/element.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/libs/gap/element.pyx 2021-05-28 11:43:51.678593573 -0600
@@ -264,7 +264,7 @@ cdef Obj make_gap_string(sage_string) ex
try:
GAP_Enter()
@ -104,8 +104,8 @@ diff -up src/sage/libs/gap/element.pyx.orig src/sage/libs/gap/element.pyx
if isinstance(i, tuple):
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-10-24 11:37:59.000000000 -0600
+++ src/sage/libs/gap/gap_includes.pxd 2020-10-30 14:42:23.392975217 -0600
--- src/sage/libs/gap/gap_includes.pxd.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/libs/gap/gap_includes.pxd 2021-05-28 11:43:51.679593573 -0600
@@ -13,8 +13,8 @@ from libc.stdint cimport uintptr_t, uint
cdef extern from "gap/system.h" nogil:
@ -225,9 +225,9 @@ diff -up src/sage/libs/gap/gap_includes.pxd.orig src/sage/libs/gap/gap_includes.
+ Obj NEW_STRING(Int len)
+ Obj MakeStringWithLen(const char *buf, size_t len)
diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
--- src/sage/libs/gap/util.pyx.orig 2020-10-24 11:37:59.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2020-10-30 14:42:23.393975216 -0600
@@ -386,7 +386,7 @@ cdef Obj gap_eval(str gap_string) except
--- src/sage/libs/gap/util.pyx.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2021-05-28 11:43:51.679593573 -0600
@@ -387,7 +387,7 @@ cdef Obj gap_eval(str gap_string) except
"""
initialize()
cdef Obj result