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

[Antonio Rojas]

    Date: Monday, September 11, 2017 @ 18:19:44
  Author: arojas
Revision: 256958

pynac 0.7.11 rebuild

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

-----------------------------+
 PKGBUILD                    |   10 +++++++---
 sagemath-pynac-0.7.11.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-11 18:14:58 UTC (rev 256957)
+++ PKGBUILD	2017-09-11 18:19:44 UTC (rev 256958)
@@ -9,7 +9,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
@@ -35,7 +35,8 @@
   mcqd coxeter3 modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe libfes)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         env.patch package.patch latte-count.patch jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch
-        r-no-readline.patch fes02.patch sagemath-ecl-no-sigfpe.patch sagemath-cython-0.26.patch)
+        r-no-readline.patch fes02.patch sagemath-ecl-no-sigfpe.patch sagemath-cython-0.26.patch
+        sagemath-pynac-0.7.11.patch)
 sha256sums=('91df3e303add71616e24b38c04789f66d57ada7b1017e5369e850c42d5e8753d'
             'e0b5b8673300857fde823209a7e90faecf9e754ab812cc5e54297eddc0c79571'
             '4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212'
@@ -46,7 +47,8 @@
             'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
             'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
             'c31809f887bf9acc45c5bd9dd30bb93e73601d3efbf3016594c3c1d241731c8a'
-            '2953ef15d957a2f3304a5584c154bf4777bcb4b461414d3a2178423257539755')
+            '2953ef15d957a2f3304a5584c154bf4777bcb4b461414d3a2178423257539755'
+            '3e23ff449a5a3a032684287722455633762636b93ecfc35fb00e875c69eff240')
 
 prepare(){
   cd sage-$pkgver
@@ -77,6 +79,8 @@
   patch -p1 -i ../sagemath-ecl-no-sigfpe.patch
 # disable auto_picke for cython 0.26 https://trac.sagemath.org/ticket/23360
   patch -p1 -i ../sagemath-cython-0.26.patch
+# fix build with pynac 0.7.11 https://trac.sagemath.org/ticket/23820
+  patch -p1 -i ../sagemath-pynac-0.7.11.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.11.patch
===================================================================
--- sagemath-pynac-0.7.11.patch	                        (rev 0)
+++ sagemath-pynac-0.7.11.patch	2017-09-11 18:19:44 UTC (rev 256958)
@@ -0,0 +1,21 @@
+--- a/src/sage/libs/pynac/pynac.pxd
++++ b/src/sage/libs/pynac/pynac.pxd
+@@ -302,7 +302,6 @@ cdef extern from "sage/libs/pynac/wrap.h":
+     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()
+--- a/src/sage/symbolic/expression.pyx
++++ b/src/sage/symbolic/expression.pyx
+@@ -5536,7 +5536,7 @@ cdef class Expression(CommutativeRingElement):
+         cdef unsigned serial
+         if is_a_add(self._gobj):
+             return add_vararg
+-        elif is_a_mul(self._gobj) or is_a_ncmul(self._gobj):
++        elif is_a_mul(self._gobj):
+             return mul_vararg
+         elif is_a_power(self._gobj):
+             return operator.pow