From 0e81f939bc63fccfa359d9cbe696d5f2e7429e3e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sat, 9 Apr 2016 15:27:54 -0300
Subject: sagemath-7.1-6.parabola1: gmp-ecm 7.0 rebuild, add patch to fix build
 with unpatched cython

---
 libre/sagemath/PKGBUILD              | 13 ++++++++-----
 libre/sagemath/cython-sys-path.patch | 10 ++++++++++
 libre/sagemath/env.patch             |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 libre/sagemath/cython-sys-path.patch

(limited to 'libre/sagemath')

diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD
index cb4e7432b..c07a2ff65 100644
--- a/libre/sagemath/PKGBUILD
+++ b/libre/sagemath/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169479 2016-04-04 18:15:22Z arojas $
+# $Id: PKGBUILD 169771 2016-04-08 18:08:24Z arojas $
 # Maintainer (Arch): Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
@@ -11,7 +11,7 @@
 
 pkgname=sagemath
 pkgver=7.1
-pkgrel=4.parabola1
+pkgrel=6.parabola1
 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty support"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
@@ -27,23 +27,24 @@ optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: B
   'modular_decomposition: modular decomposition of graphs' 'ffmpeg: to export animations to video' 'imagemagick: to show animations'
   'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'gap-data: for computing Galois groups'
   'jupyter-notebook: Jupyter notebook interface' 'atlas-lapack: improved performance for some linear algebra operations')
-makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
+makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
   mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes
 conflicts=(sage-mathematics)
 replaces=(sage-mathematics)
 provides=(sage-mathematics)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
 	pexpect.zip::"https://github.com/pexpect/pexpect/archive/524495960dd8898ddd30f7ba37298de51beee773.zip"
-	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch
+	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch cython-sys-path.patch
 	disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch gap-4.8.patch)
 md5sums=('c68e846444b9370fe79f43395cdc2725'
          'a346bb2c0350c1cb17d5325235c5e38a'
          'a906a180d198186a39820b0a2f9a9c63'
          '9ba81f717ffd4e20b8b2f2a318307488'
-         '21010618e80fc28582a84695a1fed0e5'
+         'f6c62f0ccc168c5e6e3dd9d6f73f6389'
          '0f746ed394fd7eb7a6b3963014976098'
          '6d9ae0978ce6a05a0da2cafdfb178a09'
          '5947a420a0b1483f0cbc74c76895789b'
+         'a1bcdd3fe620dbae60ed8b0e98b2ece7'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '16b529194c6105c3364127bd8f1efa83'
          'cdcabd475b80afe0534a5621e972736e'
@@ -81,6 +82,8 @@ prepare(){
   patch -p0 -i ../jupyter-path.patch
 # fix timeit with Python 2.7.11
   patch -p0 -i ../python-2.7.11.patch
+# search system paths for cython includes
+  patch -p1 -i ../cython-sys-path.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
diff --git a/libre/sagemath/cython-sys-path.patch b/libre/sagemath/cython-sys-path.patch
new file mode 100644
index 000000000..0c7cf5453
--- /dev/null
+++ b/libre/sagemath/cython-sys-path.patch
@@ -0,0 +1,10 @@
+--- sage-7.1/src/setup.py.orig	2016-04-08 16:59:24.691349473 +0000
++++ sage-7.1/src/setup.py	2016-04-08 17:03:03.847153796 +0000
+@@ -591,6 +591,7 @@
+         build_dir=SAGE_CYTHONIZED,
+         force=force,
+         aliases=aliases,
++        include_path=sys.path,
+         compiler_directives={
+             'embedsignature': True,
+             'profile': profile,
diff --git a/libre/sagemath/env.patch b/libre/sagemath/env.patch
index 96d080e23..0ec5fc68c 100644
--- a/libre/sagemath/env.patch
+++ b/libre/sagemath/env.patch
@@ -67,7 +67,7 @@
 +export SAGE_SHARE="$SAGE_LOCAL/share/sage"
 +export SAGE_EXTCODE="$SAGE_SHARE/ext"
 +export SAGE_SRC="$SAGE_SHARE/source"
-+export SAGE_DOC_SRC="$SAGE_SRC/doc"
++export SAGE_DOC_SRC="/usr/share/doc/sage"
 +export SAGE_DOC="/usr/share/doc/sage"
  
  # We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it.
-- 
cgit v1.2.3