[arch-commits] Commit in sagemath/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, April 29, 2015 @ 20:27:25
  Author: arojas
Revision: 132520

Backport some upstream bug fixes:
- Fix calling cached cython methods when sagemath-src is not installed (FS#43890)
- Fix displaying tuples in the notebook
- Fix optional parameters being ignored in 3D plots

Modified:
  sagemath/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-29 17:48:45 UTC (rev 132519)
+++ PKGBUILD	2015-04-29 18:27:25 UTC (rev 132520)
@@ -9,7 +9,7 @@
 
 pkgname=sagemath
 pkgver=6.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
@@ -34,7 +34,8 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 
 "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" 
 'anal.h' 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' 
-'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch')
+'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch'
+'dont_inspect_cython_cached_methods.patch' '3d_options.patch' 'refactor_show.patch' 'embed_signatures.patch')
 md5sums=('91eefd257f535ed2af337eeffab4c9bd'
          'd9a3e113ed147dcee8f89962a8dccd43'
          'a906a180d198186a39820b0a2f9a9c63'
@@ -46,7 +47,11 @@
          '5947a420a0b1483f0cbc74c76895789b'
          'a83a3b1bc7fcb7cbf752a83a8311fc42'
          'f333939ea6c41377b66407c81016cee4'
-         '506944613082ba7f5b34360939ca90eb')
+         '506944613082ba7f5b34360939ca90eb'
+         '6de5527b297b8601bc2c959e623bf1e7'
+         '53d831daf3c7b7f6e15940d35b65f753'
+         '34d8f9d420b66ee140450aff83a2c3db'
+         '361667a1f87b863ecb87856cff9b5c83')
 
 prepare(){
   cd sage-$pkgver
@@ -81,6 +86,13 @@
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
   patch -p0 -i "$srcdir"/fes02.patch
+# fix calling cached cython methods when source is not available http://trac.sagemath.org/ticket/17814 
+  patch -p1 -i "$srcdir"/embed_signatures.patch
+  patch -p1 -i "$srcdir"/dont_inspect_cython_cached_methods.patch
+# fix optional parameters being ignored in 3D plots http://trac.sagemath.org/ticket/18238
+  patch -p1 -i "$srcdir"/3d_options.patch
+# fix displaying tuples in the notebook http://trac.sagemath.org/ticket/17821
+  patch -p1 -i "$srcdir"/refactor_show.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*
@@ -90,9 +102,9 @@
 
 # copy required private PARI header
   mkdir -p src/pari
-  cp $srcdir/anal.h src/pari/anal.h
+  cp "$srcdir"/anal.h src/pari/anal.h
 
-  cd $srcdir/pexpect-2.0
+  cd "$srcdir"/pexpect-2.0
 # fix env in pexpect
   patch -p1 -i "$srcdir"/pexpect-env.patch
 # hide exceptions in pexpect