mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
e64d2fa863
Also: - Install an SVG icon instead of a fixed size (128x128) icon. - Require hicolor-icon-theme since we install an icon. - Drop obsolete Obsoletes.
65 lines
2.8 KiB
Diff
65 lines
2.8 KiB
Diff
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 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);
|
|
|
|
libgap_enter();
|
|
- libGAP_ReadEvalCommand(libGAP_BottomLVars);
|
|
+ libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL);
|
|
libGAP_ViewObjHandler(libGAP_ReadEvalResult);
|
|
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 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
|
|
|
|
+import re
|
|
+
|
|
|
|
############################################################################
|
|
### Hooking into the GAP memory management #################################
|
|
@@ -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):
|
|
@@ -232,6 +234,7 @@ cdef initialize():
|
|
libgap_initialize(argc, argv)
|
|
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:
|
|
raise RuntimeError('libGAP initialization failed\n' + gap_error_msg)
|
|
|