From 6a4910908d018312eb2194fdcd5629c712a995d4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 7 Apr 2016 23:37:53 -0600 Subject: [PATCH] Rebuild for libgap 4.8.3. --- sagemath-libgap.patch | 46 +++++++++++++++++++++++++++++++++++++++++-- sagemath.spec | 5 ++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/sagemath-libgap.patch b/sagemath-libgap.patch index c6f07a5..c424e75 100644 --- a/sagemath-libgap.patch +++ b/sagemath-libgap.patch @@ -1,6 +1,6 @@ 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 2015-04-03 15:10:13.247408173 -0300 +--- 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(): 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(): +@@ -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(); diff --git a/sagemath.spec b/sagemath.spec index 943497c..15c880a 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -52,7 +52,7 @@ Name: sagemath Group: Applications/Engineering Summary: A free open-source mathematics software system Version: 6.8 -Release: 7%{?dist} +Release: 8%{?dist} # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # Additionally, every $files section has a comment with the license name # before files with that license @@ -1500,6 +1500,9 @@ exit 0 ######################################################################## %changelog +* Thu Apr 7 2016 Jerry James - 6.8-8 +- Rebuild for libgap 4.8.3 + * Sat Mar 19 2016 Jerry James - 6.8-7 - Rebuild for glpk 4.59, ntl 9.7.0 and gmp-ecm 7.0