Date: Friday, November 25, 2016 @ 10:45:36 Author: arojas Revision: 196840
pynac 0.7.1 rebuild Added: sagemath/trunk/pynac-0.7.1.patch Modified: sagemath/trunk/PKGBUILD -------------------+ PKGBUILD | 11 +++++++---- pynac-0.7.1.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-25 10:09:59 UTC (rev 196839) +++ PKGBUILD 2016-11-25 10:45:36 UTC (rev 196840) @@ -10,12 +10,12 @@ pkgbase=sagemath pkgname=(sagemath sagemath-jupyter) pkgver=7.4 -pkgrel=9 +pkgrel=10 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(i686 x86_64) url="http://www.sagemath.org" license=(GPL) -depends=(ipython2 ppl palp brial singular cliquer maxima-ecl gfan sympow tachyon nauty python2-rpy2 python2-fpylll +depends=(ipython2 ppl palp brial cliquer maxima-ecl gfan sympow tachyon nauty python2-rpy2 python2-fpylll python2-matplotlib python2-scipy python2-sympy python2-networkx python2-pillow python2-future libgap flintqs lcalc lrcalc arb eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox 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) @@ -33,7 +33,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch ecm-7.patch increase-rtol.patch sagemath-singular4.patch - sagemath-cython0.25.patch) + sagemath-cython0.25.patch pynac-0.7.1.patch) md5sums=('8311ee35a309dbc668b5148795211254' '784ba3fca83f24ed0bbf62e01fa4e967' '6cafcb381437d4751fd55b25d5090987' @@ -47,7 +47,8 @@ '0c9a57d35de80c2cd418ebec912efbbb' '39d3fded716d2a7ae0ab03e0896b7497' '4bd7305e8b69add8356f9751470cf587' - 'e76faa070a490de97818762ba340d9dc') + 'e76faa070a490de97818762ba340d9dc' + '32da930dcb7c4718acf0188e090c07b9') prepare(){ cd sage-$pkgver @@ -87,6 +88,8 @@ patch -p1 -i ../sagemath-singular4.patch # fix build with cython 0.25 patch -p1 -i ../sagemath-cython0.25.patch +# port to pynac 0.7.1 + patch -p1 -i ../pynac-0.7.1.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* Added: pynac-0.7.1.patch =================================================================== --- pynac-0.7.1.patch (rev 0) +++ pynac-0.7.1.patch 2016-11-25 10:45:36 UTC (rev 196840) @@ -0,0 +1,42 @@ +--- sage-7.4/src/sage/symbolic/constants_c.pyx.orig 2016-11-25 09:34:32.665044510 +0000 ++++ sage-7.4/src/sage/symbolic/constants_c.pyx 2016-11-25 09:38:13.777888000 +0000 +@@ -60,6 +60,8 @@ + self.pointer = <GConstant *>&g_Catalan + elif self._name == "euler_gamma": + self.pointer = <GConstant *>&g_Euler ++ elif self._name == "NaN": ++ self.pointer = <GConstant *>&g_NaN + else: + GConstant_construct(&self.object, name, texname, domain) + self.pointer = &self.object +--- sage-7.4/src/sage/symbolic/ginac.pxd.orig 2016-11-25 09:34:06.145103155 +0000 ++++ sage-7.4/src/sage/symbolic/ginac.pxd 2016-11-25 09:37:14.294686607 +0000 +@@ -216,6 +216,7 @@ + GEx g_Pi "Pi" + GEx g_Catalan "Catalan" + GEx g_Euler "Euler" ++ GEx g_NaN "NaN" + + GConstant* GConstant_construct(void *mem, char* name, char* texname, unsigned domain) + bint is_a_constant "is_a<constant>" (GEx e) +@@ -293,13 +294,13 @@ + void g_list_symbols "list_symbols" (GEx e, GExSet s) + + # more is_a tests +- bint is_a_add "is_a<add>" (GEx e) +- bint is_a_mul "is_a<mul>" (GEx e) +- bint is_a_power "is_a<power>" (GEx e) +- bint is_a_fderivative "is_a<fderivative>" (GEx e) +- bint is_a_function "is_a<function>" (GEx e) +- bint is_exactly_a_function "is_exactly_a<function>" (GEx e) +- bint is_a_ncmul "is_a<ncmul>" (GEx e) ++ bint is_a_add "is_a<GiNaC::add>" (GEx e) ++ bint is_a_mul "is_a<GiNaC::mul>" (GEx e) ++ bint is_a_power "is_a<GiNaC::power>" (GEx e) ++ bint is_a_fderivative "is_a<GiNaC::fderivative>" (GEx e) ++ bint is_a_function "is_a<GiNaC::function>" (GEx e) ++ bint is_exactly_a_function "is_exactly_a<GiNaC::function>" (GEx e) ++ bint is_a_ncmul "is_a<GiNaC::ncmul>" (GEx e) + + # Arithmetic + int ginac_error()