diff options
Diffstat (limited to 'libre/sagemath')
| -rw-r--r-- | libre/sagemath/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/sagemath/cython-0.23.patch | 16 |
2 files changed, 24 insertions, 5 deletions
diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD index e121efc5f..199bb1d0a 100644 --- a/libre/sagemath/PKGBUILD +++ b/libre/sagemath/PKGBUILD @@ -11,12 +11,12 @@ pkgname=sagemath pkgver=6.8 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty recommendation" arch=(i686 x86_64) url="http://www.sagemath.org" license=(GPL) -depends=(ipython2 ppl glpk mpfi palp polybori singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2 +depends=(ipython2 ppl mpfi palp polybori singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2 python2-matplotlib python2-scipy python2-sympy python2-networkx libgap gap flintqs lcalc lrcalc eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata pari-seadata-small planarity rankwidth sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials) @@ -27,7 +27,7 @@ optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: B 'modular_decomposition: modular decomposition of graphs' 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'imagemagick: to show animations' 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'arb: floating-point ball arithmetic') -makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc +makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc mcqd coxeter3 cryptominisat arb modular_decomposition bliss-graphs) # libfes conflicts=(sage-mathematics) replaces=(sage-mathematics) @@ -36,7 +36,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgv # "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" "http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2" 'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' -'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch') +'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch' 'cython-0.23.patch') md5sums=('943780ef4460e38f28fefe95e3138981' 'd9a3e113ed147dcee8f89962a8dccd43' 'a906a180d198186a39820b0a2f9a9c63' @@ -47,7 +47,8 @@ md5sums=('943780ef4460e38f28fefe95e3138981' '5947a420a0b1483f0cbc74c76895789b' 'a83a3b1bc7fcb7cbf752a83a8311fc42' 'f333939ea6c41377b66407c81016cee4' - '4eb23a3c7363258bc9ba764d6e5512ba') + '4eb23a3c7363258bc9ba764d6e5512ba' + '1b8dfa047115180aa0afbeaf19d97762') prepare(){ cd sage-$pkgver @@ -84,6 +85,8 @@ prepare(){ # patch -p0 -i "$srcdir"/fes02.patch # disable fes module, fails to compile patch -p0 -i ../disable-fes.patch +# fix build with cython 0.23 + patch -p1 -i "$srcdir"/cython-0.23.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* diff --git a/libre/sagemath/cython-0.23.patch b/libre/sagemath/cython-0.23.patch new file mode 100644 index 000000000..2ae14ad57 --- /dev/null +++ b/libre/sagemath/cython-0.23.patch @@ -0,0 +1,16 @@ +diff --git a/src/sage/libs/polybori/decl.pxd b/src/sage/libs/polybori/decl.pxd +index b8fcc6e..6ec4bce 100644 +--- a/src/sage/libs/polybori/decl.pxd ++++ b/src/sage/libs/polybori/decl.pxd +@@ -10,8 +10,8 @@ cdef extern from "sage/libs/polybori/pb_wrap.h": + pbdp_asc "CTypes::dp_asc" + pbblock_dlex "CTypes::block_dlex" + pbblock_dp_asc "CTypes::block_dp_asc" +- pbdp "17" +- pbblock_dp "19" ++ pbdp "static_cast<COrderEnums::ordercodes>(17)" ++ pbblock_dp "static_cast<COrderEnums::ordercodes>(19)" + + cdef enum comparecodes "CCompareEnums::comparecodes": + less_than "CTypes::less_than" + |