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

Rebuild for libgap 4.8.3.

Browse source
This commit is contained in:
Jerry James 2016-04-07 23:37:53 -06:00
parent 9291c99bee
commit 6a4910908d
2 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
sagemath-libgap.patch
View file

@ -1,6 +1,6 @@
diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
--- src/sage/libs/gap/util.pyx.orig 2015-04-03 15:10:03.911407815 -0300 --- src/sage/libs/gap/util.pyx.orig 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2015-04-03 15:10:13.247408173 -0300 +++ src/sage/libs/gap/util.pyx 2016-04-07 17:49:52.497518812 -0600
@@ -153,18 +153,9 @@ def gap_root(): @@ -153,18 +153,9 @@ def gap_root():
sage: from sage.libs.gap.util import gap_root sage: from sage.libs.gap.util import gap_root
@ -22,3 +22,45 @@ diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
cdef initialize(): 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();

5
sagemath.spec
View file

@ -52,7 +52,7 @@ Name: sagemath
Group: Applications/Engineering Group: Applications/Engineering
Summary: A free open-source mathematics software system Summary: A free open-source mathematics software system
Version: 6.8 Version: 6.8
Release: 7%{?dist} Release: 8%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name # Additionally, every $files section has a comment with the license name
# before files with that license # before files with that license
@ -1500,6 +1500,9 @@ exit 0
######################################################################## ########################################################################
%changelog %changelog
* Thu Apr 7 2016 Jerry James <loganjerry@gmail.com> - 6.8-8
- Rebuild for libgap 4.8.3
* Sat Mar 19 2016 Jerry James <loganjerry@gmail.com> - 6.8-7 * Sat Mar 19 2016 Jerry James <loganjerry@gmail.com> - 6.8-7
- Rebuild for glpk 4.59, ntl 9.7.0 and gmp-ecm 7.0 - Rebuild for glpk 4.59, ntl 9.7.0 and gmp-ecm 7.0