[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-pynac-0.7.6.patch)

[Antonio Rojas]

    Date: Thursday, April 20, 2017 @ 17:10:16
  Author: arojas
Revision: 223999

pynac 0.7.6 rebuild

Added:
  sagemath/trunk/sagemath-pynac-0.7.6.patch
Modified:
  sagemath/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    9 +++++---
 sagemath-pynac-0.7.6.patch |   44 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-20 15:47:06 UTC (rev 223998)
+++ PKGBUILD	2017-04-20 17:10:16 UTC (rev 223999)
@@ -10,7 +10,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=7.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
@@ -36,7 +36,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 latte-count.patch
         jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch ecm-7.patch increase-rtol.patch r-no-readline.patch
-        sagemath-planarity3.patch fes02.patch sagemath-singular-4.1.0.p2.patch)
+        sagemath-planarity3.patch fes02.patch sagemath-singular-4.1.0.p2.patch sagemath-pynac-0.7.6.patch)
 sha256sums=('e6e0729ab25446e7c922058db0eee4b0b294b32c196e34842e843ea9fae41423'
             'dc0a92b81e9e2faab05cf8a5adb40ae7010be74446bc80d5aea15f59706f2cff'
             'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04'
@@ -52,7 +52,8 @@
             'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
             'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7'
             'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
-            'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7')
+            'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7'
+            '42d6549d9a07bcea9fa79bb63961ebbfaaa4ca64e9c6a402ae90d559bb256c12')
 
 prepare(){
   cd sage-$pkgver
@@ -90,6 +91,8 @@
   patch -p1 -i ../fes02.patch
 # replace is_package_installed usage http://trac.sagemath.org/ticket/20377
   patch -p1 -i ../is-package-installed.patch
+# port to pynac 0.7.6 https://trac.sagemath.org/ticket/22838
+  patch -p1 -i ../sagemath-pynac-0.7.6.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*

Added: sagemath-pynac-0.7.6.patch
===================================================================
--- sagemath-pynac-0.7.6.patch	                        (rev 0)
+++ sagemath-pynac-0.7.6.patch	2017-04-20 17:10:16 UTC (rev 223999)
@@ -0,0 +1,44 @@
+diff --git a/src/sage/libs/pynac/pynac.pxd b/src/sage/libs/pynac/pynac.pxd
+index 15e8ac2..568dbd6 100644
+--- a/src/sage/libs/pynac/pynac.pxd
++++ b/src/sage/libs/pynac/pynac.pxd
+@@ -319,7 +319,7 @@ cdef extern from "sage/libs/pynac/wrap.h":
+ 
+ 
+     GEx g_abs "GiNaC::abs" (GEx x)                      except + # absolute value
+-    GEx g_step "GiNaC::step" (GEx x)                    except + # step function
++    GEx g_step "GiNaC::unit_step" (GEx x)               except + # step function
+     GEx g_csgn "GiNaC::csgn" (GEx x)                    except + # complex sign
+     GEx g_conjugate "GiNaC::conjugate_function" (GEx x) except + # complex conjugation
+     GEx g_real_part "GiNaC::real_part_function" (GEx x) except + # real part
+diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
+index 01319b5..735d6fa 100644
+--- a/src/sage/symbolic/expression.pyx
++++ b/src/sage/symbolic/expression.pyx
+@@ -7018,7 +7018,7 @@ cdef class Expression(CommutativeRingElement):
+     def step(self, hold=False):
+         """
+         Return the value of the Heaviside step function, which is 0 for
+-        negative x, 1/2 for 0, and 1 for positive x.
++        negative x, 1 for 0, and 1 for positive x.
+ 
+         EXAMPLES::
+ 
+@@ -7026,7 +7026,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: SR(1.5).step()
+             1
+             sage: SR(0).step()
+-            1/2
++            1
+             sage: SR(-1/2).step()
+             0
+             sage: SR(float(-1)).step()
+@@ -7038,7 +7038,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: SR(2).step()
+             1
+             sage: SR(2).step(hold=True)
+-            step(2)
++            unit_step(2)
+ 
+         """
+         return new_Expression_from_GEx(self._parent,