diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | sagemath-pynac-0.7.14.patch | 167 |
3 files changed, 3 insertions, 175 deletions
@@ -1,6 +1,6 @@ pkgbase = sagemath-git pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab - pkgver = 8.2.beta0.r0.g8d9c008a75 + pkgver = 8.2.beta1.r0.gd3b9b396c1 pkgrel = 1 url = http://www.sagemath.org arch = x86_64 @@ -104,7 +104,6 @@ pkgbase = sagemath-git source = sagemath-detect-igraph.patch source = sagemath-networkx2.patch source = sagemath-linbox-1.5.patch - source = sagemath-pynac-0.7.14.patch source = sagemath-matplotlib2.patch source = sagemath-scipy-1.0.patch source = sagemath-lrs.patch @@ -123,7 +122,6 @@ pkgbase = sagemath-git sha256sums = 28d7789b8d777922ab8871ca43b6afab751428cae875c0343d3962e6a2030b88 sha256sums = 1024f3a6a9a1a6ae96d9962bb7d1f5842f4a4a5ff5098afad81a60188b7d5160 sha256sums = a52d03e04c9d64bb957a1f8dcdae3280ebb9450a7fd76aaf5ae5de5c6f74774f - sha256sums = 538f7b279d72f4b67edb445d386d267f3f7022c1079031ca7ea06f6ce392c906 sha256sums = b9ab2bb5f381ea425e8763b81b8b3a108a3951c594fb1f37f7df921e7c77e26d sha256sums = 17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a sha256sums = c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c @@ -8,7 +8,7 @@ pkgbase=sagemath-git pkgname=(sagemath-git sagemath-jupyter-git) -pkgver=8.2.beta0.r0.g8d9c008a75 +pkgver=8.2.beta1.r0.gd3b9b396c1 pkgrel=1 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(x86_64) @@ -37,7 +37,7 @@ makedepends=(cython2 boost ratpoints symmetrica python2-jinja coin-or-cbc libhom source=(git://git.sagemath.org/sage.git#branch=develop 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 pari-stackwarn.patch - sagemath-detect-igraph.patch sagemath-networkx2.patch sagemath-linbox-1.5.patch sagemath-pynac-0.7.14.patch + sagemath-detect-igraph.patch sagemath-networkx2.patch sagemath-linbox-1.5.patch sagemath-matplotlib2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch sagemath-ipython-prompt.patch) sha256sums=('SKIP' '39b76a189365464998cab9355d177581bc2b15dff10858f316faa85f2efa0426' @@ -53,7 +53,6 @@ sha256sums=('SKIP' '28d7789b8d777922ab8871ca43b6afab751428cae875c0343d3962e6a2030b88' '1024f3a6a9a1a6ae96d9962bb7d1f5842f4a4a5ff5098afad81a60188b7d5160' 'a52d03e04c9d64bb957a1f8dcdae3280ebb9450a7fd76aaf5ae5de5c6f74774f' - '538f7b279d72f4b67edb445d386d267f3f7022c1079031ca7ea06f6ce392c906' 'b9ab2bb5f381ea425e8763b81b8b3a108a3951c594fb1f37f7df921e7c77e26d' '17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a' 'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c' @@ -105,8 +104,6 @@ prepare(){ patch -p1 -i ../fes02.patch # fix build with linbox 1.5 https://trac.sagemath.org/ticket/24214 patch -p1 -i ../sagemath-linbox-1.5.patch -# fix build with pynac 0.7.14 https://trac.sagemath.org/ticket/24329 - patch -p1 -i ../sagemath-pynac-0.7.14.patch # port away from deprecated and removed functions in matplotlib 2 https://trac.sagemath.org/ticket/23696 patch -p1 -i ../sagemath-matplotlib2.patch diff --git a/sagemath-pynac-0.7.14.patch b/sagemath-pynac-0.7.14.patch deleted file mode 100644 index 322b51e04efd..000000000000 --- a/sagemath-pynac-0.7.14.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff --git a/src/sage/libs/pynac/pynac.pxd b/src/sage/libs/pynac/pynac.pxd -index d4afc4e..6d1fcac 100644 ---- a/src/sage/libs/pynac/pynac.pxd -+++ b/src/sage/libs/pynac/pynac.pxd -@@ -481,22 +481,17 @@ cdef extern from "pynac_wrap.h": - ctypedef GParamSet const_paramset_ref "const GiNaC::paramset&" - - ctypedef struct py_funcs_struct: -- py_binomial(a, b) -- py_binomial_int(int n, unsigned int k) - py_gcd(a, b) - py_lcm(a, b) - py_real(a) - py_imag(a) - py_numer(a) - py_denom(a) -- py_conjugate(a) - bint py_is_rational(a) -- bint py_is_crational(a) - bint py_is_real(a) - bint py_is_integer(a) - bint py_is_equal(a, b) - bint py_is_even(a) -- bint py_is_cinteger(a) - bint py_is_prime(n) - bint py_is_exact(x) - -@@ -534,23 +529,14 @@ cdef extern from "pynac_wrap.h": - py_asinh(x) - py_acosh(x) - py_atanh(x) -- py_tgamma(x) -- py_lgamma(x) - py_isqrt(x) - py_sqrt(x) -- py_abs(x) - py_mod(x, y) - py_smod(x, y) - py_irem(x, y) -- py_iquo(x, y) -- py_iquo2(x, y) -- py_li(x, n, parent) -- py_li2(x) - py_psi(x) - py_psi2(n, x) - -- int py_int_length(x) except -1 -- - py_eval_constant(unsigned serial, parent) - py_eval_unsigned_infinity() - py_eval_infinity() -@@ -583,8 +569,6 @@ cdef extern from "pynac_wrap.h": - stdstring* py_latex_fderivative(unsigned id, params, args) - paramset_to_PyTuple(const_paramset_ref s) - -- py_rational_power_parts(basis, exp) -- - py_funcs_struct py_funcs "GiNaC::py_funcs" - - cdef extern from "pynac/order.h": -diff --git a/src/sage/libs/pynac/pynac.pyx b/src/sage/libs/pynac/pynac.pyx -index f303184..419cc47 100644 ---- a/src/sage/libs/pynac/pynac.pyx -+++ b/src/sage/libs/pynac/pynac.pyx -@@ -2432,23 +2432,18 @@ def init_function_table(): - called before Pynac is used; otherwise, there will be segfaults. - """ - -- py_funcs.py_binomial_int = &py_binomial_int -- py_funcs.py_binomial = &py_binomial - py_funcs.py_gcd = &py_gcd - py_funcs.py_lcm = &py_lcm - py_funcs.py_real = &py_real - py_funcs.py_imag = &py_imag - py_funcs.py_numer = &py_numer - py_funcs.py_denom = &py_denom -- py_funcs.py_conjugate = &py_conjugate - - py_funcs.py_is_rational = &py_is_rational -- py_funcs.py_is_crational = &py_is_crational - py_funcs.py_is_real = &py_is_real - py_funcs.py_is_integer = &py_is_integer - py_funcs.py_is_equal = &py_is_equal - py_funcs.py_is_even = &py_is_even -- py_funcs.py_is_cinteger = &py_is_cinteger - py_funcs.py_is_prime = &py_is_prime - py_funcs.py_is_exact = &py_is_exact - -@@ -2462,7 +2457,6 @@ def init_function_table(): - py_funcs.py_mpq_from_rational = &py_mpq_from_rational - - py_funcs.py_float = &py_float -- py_funcs.py_RDF_from_double = &py_RDF_from_double - - py_funcs.py_factorial = &py_factorial - py_funcs.py_doublefactorial = &py_doublefactorial -@@ -2486,23 +2480,14 @@ def init_function_table(): - py_funcs.py_asinh = &py_asinh - py_funcs.py_acosh = &py_acosh - py_funcs.py_atanh = &py_atanh -- py_funcs.py_tgamma = &py_tgamma -- py_funcs.py_lgamma = &py_lgamma - py_funcs.py_isqrt = &py_isqrt - py_funcs.py_sqrt = &py_sqrt -- py_funcs.py_abs = &py_abs - py_funcs.py_mod = &py_mod - py_funcs.py_smod = &py_smod - py_funcs.py_irem = &py_irem -- py_funcs.py_iquo = &py_iquo -- py_funcs.py_iquo2 = &py_iquo2 -- py_funcs.py_li = &py_li -- py_funcs.py_li2 = &py_li2 - py_funcs.py_psi = &py_psi - py_funcs.py_psi2 = &py_psi2 - -- py_funcs.py_int_length = &py_int_length -- - py_funcs.py_eval_constant = &py_eval_constant - py_funcs.py_eval_unsigned_infinity = &py_eval_unsigned_infinity - py_funcs.py_eval_infinity = &py_eval_infinity -@@ -2531,7 +2516,6 @@ def init_function_table(): - py_funcs.py_print_fderivative = &py_print_fderivative - py_funcs.py_latex_fderivative = &py_latex_fderivative - py_funcs.paramset_to_PyTuple = ¶mset_to_PyTuple -- py_funcs.py_rational_power_parts = &py_rational_power_parts - - init_function_table() - init_pynac_I() - -diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py -index 81cd485..931cecc 100644 ---- a/src/sage/functions/other.py -+++ b/src/sage/functions/other.py -@@ -688,7 +688,6 @@ class Function_gamma(GinacFunction): - :meth:`sage.functions.other.gamma` - """ - GinacFunction.__init__(self, 'gamma', latex_name=r"\Gamma", -- ginac_name='tgamma', - conversions={'mathematica':'Gamma', - 'maple':'GAMMA', - 'sympy':'gamma', -diff --git a/src/sage/libs/pynac/pynac.pxd b/src/sage/libs/pynac/pynac.pxd -index 1739067..d4afc4e 100644 ---- a/src/sage/libs/pynac/pynac.pxd -+++ b/src/sage/libs/pynac/pynac.pxd -@@ -362,7 +362,7 @@ cdef extern from "pynac_wrap.h": - GEx g_zeta2 "GiNaC::zeta" (GEx m, GEx s) except + # alternating Euler sum - GEx g_stieltjes "GiNaC::stieltjes" (GEx m) except + # Stieltjes constants - GEx g_zetaderiv "GiNaC::zetaderiv" (GEx n, GEx x) except + # derivatives of Riemann's zeta function -- GEx g_tgamma "GiNaC::tgamma" (GEx x) except + # gamma function -+ GEx g_gamma "GiNaC::gamma" (GEx x) except + # gamma function - GEx g_lgamma "GiNaC::lgamma" (GEx x) except + # logarithm of gamma function - GEx g_beta "GiNaC::beta" (GEx x, GEx y) except + # beta function (tgamma(x)*tgamma(y)/tgamma(x+y)) - GEx g_psi "GiNaC::psi" (GEx x) except + # psi (digamma) function -diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx -index dfb8751..52303d1 100644 ---- a/src/sage/symbolic/expression.pyx -+++ b/src/sage/symbolic/expression.pyx -@@ -8917,7 +8917,7 @@ cdef class Expression(CommutativeRingElement): - cdef GEx x - sig_on() - try: -- x = g_hold_wrapper(g_tgamma, self._gobj, hold) -+ x = g_hold_wrapper(g_gamma, self._gobj, hold) - finally: - sig_off() - return new_Expression_from_GEx(self._parent, x) |