Date: Saturday, July 7, 2018 @ 10:15:57 Author: arojas Revision: 353942
Make sure to use GAP 4.8 Added: sagemath/trunk/sagemath-gap-4.8.patch Modified: sagemath/trunk/PKGBUILD sagemath/trunk/sagemath-env.patch sagemath/trunk/sagemath-singular-4.1.1.patch -------------------------------+ PKGBUILD | 13 ++++++++----- sagemath-env.patch | 4 ++-- sagemath-gap-4.8.patch | 31 +++++++++++++++++++++++++++++++ sagemath-singular-4.1.1.patch | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-07-07 09:46:49 UTC (rev 353941) +++ PKGBUILD 2018-07-07 10:15:57 UTC (rev 353942) @@ -9,7 +9,7 @@ pkgbase=sagemath pkgname=(sagemath sagemath-jupyter) pkgver=8.2 -pkgrel=7 +pkgrel=8 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(x86_64) url="http://www.sagemath.org" @@ -24,7 +24,7 @@ 'coin-or-cbc: COIN backend for numerical computations' 'coin-or-csdp: for computing Lovász theta-function of graphs' 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' 'ffmpeg: to export animations to video' 'imagemagick: to show animations' - 'coxeter: Coxeter groups implementation' 'cryptominisat5: SAT solver' 'gap-data: for computing Galois groups' + 'coxeter: Coxeter groups implementation' 'cryptominisat5: SAT solver' 'gap-4.8-data: for computing Galois groups' 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'libhomfly: for computing the homfly polynomial of links' 'libbraiding: for computing in braid groups' 'libfes: exhaustive search of solutions for boolean equations' 'python2-pynormaliz: Normaliz backend for polyhedral computations' @@ -38,10 +38,10 @@ sagemath-env.patch package.patch latte-count.patch jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch r-no-readline.patch fes02.patch sagemath-threejs.patch sagemath-ignore-warnings.patch sagemath-detect-igraph.patch sagemath-networkx2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch - sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch + sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch sagemath-gap-4.8.patch pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch") sha256sums=('41ba2c2dde7a02e1bb6880ae875d37ab058567cc26e760efe87eeb12188cd65b' - '6f95ef6960acb3b368bc6245783d88fcadaa63537e1bf9f41d8d91b28e95ddf9' + 'b3c5f5c159d72ba7bc2b186b7b0e50a02b1ca60caef49b3857dbaad3da36b6fc' 'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107' '0b680e674c11c47afa86162d8b49645620b8912722e08133d23357c29ca9310a' '2cad308f8adbb6c54e6603fa22b2f0eb60f6f09248d5d015000c3932ac14f646' @@ -55,8 +55,9 @@ '8253730940687992dd29d90d95bea7e2685bb4854db004090c8196ce92859b64' '17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a' 'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c' - '11a68f156647ba9f38cb01b2a5e4f9a6a78f6297f2a5a65fbfdfe32d4be69d0c' + '507bf761df222d1961d53ebeaf8e6a5a3dc2d7b9cb78748d71ed8cb1ee1c4ac6' '5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0' + '6917cb74e50ae965ea8d7c39577e5f0a5068e4b6a67b53fc6f219149a7d06584' 'e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9') prepare(){ @@ -98,6 +99,8 @@ patch -Rp1 -i ../pari-ratpoints.patch # don't force c++98 for lcalc (fixes build with NTL 11) patch -p1 -i ../sagemath-lcalc-c++11.patch +# Adjust paths for gap-4.8 + patch -p1 -i ../sagemath-gap-4.8.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 Modified: sagemath-env.patch =================================================================== --- sagemath-env.patch 2018-07-07 09:46:49 UTC (rev 353941) +++ sagemath-env.patch 2018-07-07 10:15:57 UTC (rev 353942) @@ -85,7 +85,7 @@ export SAGE_LOGS="$SAGE_ROOT/logs/pkgs" -export SAGE_SRC="$SAGE_ROOT/src" -export SAGE_DOC_SRC="$SAGE_SRC/doc" -+export GAP_ROOT_DIR="/usr/lib/gap" ++export GAP_ROOT_DIR="/usr/lib/gap-4.8" +export SAGE_SRC="$SAGE_LOCAL/lib/python2.7/site-packages" +export SAGE_DOC_SRC="$SAGE_SHARE/doc/sage" export SAGE_DOC="$SAGE_SHARE/doc/sage" @@ -143,7 +143,7 @@ _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('$SAGE_LOCAL','lib','gap')) ++_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','lib','gap-4.8')) _add_variable_or_fallback('THEBE_DIR', opj('$SAGE_SHARE','thebe')) # locate singular shared object Added: sagemath-gap-4.8.patch =================================================================== --- sagemath-gap-4.8.patch (rev 0) +++ sagemath-gap-4.8.patch 2018-07-07 10:15:57 UTC (rev 353942) @@ -0,0 +1,31 @@ +diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py +index 177fc1b6eb..51c67bdd09 100644 +--- a/src/sage/interfaces/gap.py ++++ b/src/sage/interfaces/gap.py +@@ -197,11 +197,11 @@ import string + + WORKSPACE = gap_workspace_file() + +-GAP_BINARY = os.path.join(SAGE_LOCAL, 'bin', 'gap') ++GAP_BINARY = os.path.join(SAGE_LOCAL, 'bin', 'gap-4.8') + + first_try = True + +-gap_cmd = "gap -r" ++gap_cmd = "gap-4.8 -r" + if platform.processor() == 'ia64' and os.path.exists('/usr/bin/prctl'): + # suppress unaligned access to 0x..., ip=0x... warnings + gap_cmd = 'prctl --unaligned=silent ' + gap_cmd +diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx +index 7bffcfc00d..51dad178d5 100644 +--- a/src/sage/libs/gap/util.pyx ++++ b/src/sage/libs/gap/util.pyx +@@ -166,7 +166,7 @@ def gap_root(): + 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() ++ gap_sh = open(os.path.join(SAGE_LOCAL, 'bin', 'gap-4.8')).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) Modified: sagemath-singular-4.1.1.patch =================================================================== --- sagemath-singular-4.1.1.patch 2018-07-07 09:46:49 UTC (rev 353941) +++ sagemath-singular-4.1.1.patch 2018-07-07 10:15:57 UTC (rev 353942) @@ -96,7 +96,7 @@ index 809ca72c76..9610ce125d 100644 --- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx -@@ -4888,7 +4888,7 @@ cdef class MPolynomial_libsingular(MPolynomial): +@@ -4881,7 +4881,7 @@ cdef class MPolynomial_libsingular(MPolynomial): if right.is_zero(): raise ZeroDivisionError