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

Update to sagemath 8.3 (bz 1612867).

Browse source 
Also:
- Drop -lrslib, -gap-hap, and -flask patches.
- Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934).
- Drop obsolete mktexlsr invocations.
- Fix more Singular paths.
- Fix still more uses of /usr/bin/env.
- Drop disallow/dissallow fixup for cython; now fixed in cython itself.
This commit is contained in:
Jerry James 2018-09-23 08:28:54 -06:00
parent 3dc6dbb3c1
commit 1a0bd1afc6
24 changed files with 285 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

57
sagemath-libgap.patch
View file

@ -1,6 +1,30 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/env.py 2018-08-29 11:25:26.833962117 -0600
@@ -164,7 +164,7 @@ _add_variable_or_fallback('CONWAY_POLYNO
_add_variable_or_fallback('GRAPHS_DATA_DIR', opj('$SAGE_SHARE','graphs'))
_add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves'))
_add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes'))
-_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','gap','latest'))
+_add_variable_or_fallback('GAP_ROOT_DIR', opj('usr','lib','gap'))
_add_variable_or_fallback('THEBE_DIR', opj('$SAGE_SHARE','thebe'))
# locate singular shared object
diff -up src/sage/interfaces/gap.py.orig src/sage/interfaces/gap.py
--- src/sage/interfaces/gap.py.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/interfaces/gap.py 2018-08-29 11:21:43.180584324 -0600
@@ -197,7 +197,7 @@ import string
WORKSPACE = gap_workspace_file()
-GAP_BINARY = os.path.join(SAGE_LOCAL, 'bin', 'gap')
+GAP_BINARY = os.path.join('usr', 'bin', 'gap')
first_try = True
diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c
--- src/sage/libs/gap/test/main.c.orig 2017-07-21 13:10:16.000000000 -0600
+++ src/sage/libs/gap/test/main.c 2017-11-24 10:40:06.024865775 -0700
--- src/sage/libs/gap/test/main.c.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/libs/gap/test/main.c 2018-08-29 10:38:22.512653256 -0600
@@ -22,7 +22,7 @@ void eval(char* cmd) {
libgap_start_interaction(cmd);
@ -11,40 +35,29 @@ diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c
char* out = libgap_get_output();
libgap_exit();
diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
--- src/sage/libs/gap/util.pyx.orig 2017-07-21 13:10:16.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2017-11-24 10:41:12.757621519 -0700
@@ -22,6 +22,8 @@ from sage.interfaces.gap_workspace impor
--- src/sage/libs/gap/util.pyx.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2018-08-29 11:32:06.654205922 -0600
@@ -25,6 +25,8 @@ from sage.cpython.string cimport str_to_
from sage.interfaces.gap_workspace import prepare_workspace_dir
from sage.env import SAGE_LOCAL, GAP_ROOT_DIR
from .element cimport *
+import re
+
############################################################################
### Hooking into the GAP memory management #################################
@@ -160,17 +162,9 @@ def gap_root():
@@ -164,7 +166,7 @@ def gap_root():
sage: from sage.libs.gap.util import gap_root
sage: gap_root() # random output
- '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
+ '/usr/lib/gap'
"""
- import os.path
- if os.path.exists(GAP_ROOT_DIR):
- return GAP_ROOT_DIR
- print('The gap-4.5.5.spkg (or later) seems to be not installed!')
- gap_sh = open(os.path.join(SAGE_LOCAL, 'bin', 'gap')).read().splitlines()
- gapdir = filter(lambda dir:dir.strip().startswith('GAP_DIR'), gap_sh)[0]
- gapdir = gapdir.split('"')[1]
- gapdir = gapdir.replace('$SAGE_LOCAL', SAGE_LOCAL)
- return gapdir
+ return '/usr/lib/gap'
cdef initialize():
@@ -224,6 +218,7 @@ cdef initialize():
import os.path
if os.path.exists(GAP_ROOT_DIR):
@@ -232,6 +234,7 @@ cdef initialize():
libgap_initialize(argc, argv)
gap_error_msg = str(libgap_get_output())
gap_error_msg = char_to_str(libgap_get_output())
libgap_finish_interaction()
+ gap_error_msg = re.sub(r'#I.*\n?', '', gap_error_msg, flags=re.MULTILINE)
if gap_error_msg: