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 7.3

Browse source
This commit is contained in:
pcpa 2016-08-20 13:51:55 -04:00
parent a3d306800c
commit 0fdebf23cf
35 changed files with 3245 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

62
sagemath-libgap.patch
View file

@ -1,7 +1,19 @@
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 2016-08-08 13:43:32.376552613 -0400
+++ src/sage/libs/gap/test/main.c 2016-08-08 13:43:38.209552837 -0400
@@ -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 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2016-04-07 17:49:52.497518812 -0600
@@ -153,18 +153,9 @@ def gap_root():
--- src/sage/libs/gap/util.pyx.orig 2016-08-08 13:41:46.176548547 -0400
+++ src/sage/libs/gap/util.pyx 2016-08-08 13:42:26.594550094 -0400
@@ -154,18 +154,9 @@ def gap_root():
sage: from sage.libs.gap.util import gap_root
sage: gap_root() # random output
@ -12,7 +24,7 @@ diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
- gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')
- if os.path.exists(gapdir):
- return gapdir
- print 'The gap-4.5.5.spkg (or later) seems to be not installed!'
- 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]
@ -22,45 +34,3 @@ diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
cdef initialize():
@@ -280,7 +271,7 @@ cdef libGAP_Obj gap_eval(str gap_string)
libgap_start_interaction(cmd)
try:
sig_on()
- status = libGAP_ReadEvalCommand(libGAP_BottomLVars)
+ status = libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL)
if status != libGAP_STATUS_END:
libgap_call_error_handler()
sig_off()
@@ -464,7 +455,7 @@ def command(command_string):
libgap_start_interaction(cmd)
try:
sig_on()
- status = libGAP_ReadEvalCommand(libGAP_BottomLVars)
+ status = libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL)
if status != libGAP_STATUS_END:
libgap_call_error_handler()
sig_off()
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 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/libs/gap/gap_includes.pxd 2016-04-07 17:50:43.958388846 -0600
@@ -131,7 +131,7 @@ cdef extern from "gap/objects.h":
cdef int libGAP_LAST_TESTING_TNUM
cdef extern from "gap/read.h":
- void* libGAP_ReadEvalCommand(libGAP_Obj context)
+ void* libGAP_ReadEvalCommand(libGAP_Obj context, void *dualSemicolon)
void* libGAP_ReadEvalFile()
void* libGAP_ReadEvalResult
bint libGAP_READ_ERROR()
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 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/libs/gap/test/main.c 2016-04-07 17:51:07.339512407 -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();