[arch-commits] Commit in sagemath/trunk (3 files)
Antonio Rojas
arojas at archlinux.org
Sat Nov 5 23:46:25 UTC 2016
Date: Saturday, November 5, 2016 @ 23:46:24
Author: arojas
Revision: 194713
pynac 0.7.0 rebuild
Added:
sagemath/trunk/sagemath-cython0.25.patch
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/package.patch
---------------------------+
PKGBUILD | 18 +++++++++++-------
package.patch | 6 ++----
sagemath-cython0.25.patch | 30 ++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-05 21:52:12 UTC (rev 194712)
+++ PKGBUILD 2016-11-05 23:46:24 UTC (rev 194713)
@@ -10,7 +10,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=7.4
-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"
@@ -25,20 +25,21 @@
'coin-or-cbc: COIN backend for numerical computations' 'coin-or-csdp: for computing Lovász theta-function of graphs'
'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids'
'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'
+ 'coxeter3: Coxeter groups implementation' 'cryptominisat2: SAT solver' 'gap-data: for computing Galois groups'
'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes'
'libhomfly: for computing the homfly polynomial of links' 'libbraiding: for computing in braid groups')
makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc libhomfly libbraiding
- mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes
+ mcqd coxeter3 cryptominisat2 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 skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch disable-fes.patch
- jupyter-path.patch test-optional.patch python-2.7.11.patch ecm-7.patch increase-rtol.patch sagemath-singular4.patch)
+ jupyter-path.patch test-optional.patch python-2.7.11.patch ecm-7.patch increase-rtol.patch sagemath-singular4.patch
+ sagemath-cython0.25.patch)
md5sums=('8311ee35a309dbc668b5148795211254'
'784ba3fca83f24ed0bbf62e01fa4e967'
'6cafcb381437d4751fd55b25d5090987'
'a1bcdd3fe620dbae60ed8b0e98b2ece7'
'5dca842e4440e4ef235ae18c1b1f20e3'
- '493a9e0eae9b2ef87544b42785ae11ea'
+ 'ccfd5b1bc4796f414f1531be52504dd7'
'06a67e611d10aa2381efe1f08ea4ffd9'
'0d88207416dfb98a17bf8886257d9a02'
'921017fd2d9dadbb6b602ac0476bfd58'
@@ -45,7 +46,8 @@
'ef927896f2071b442b1d07d7e69f5f3a'
'0c9a57d35de80c2cd418ebec912efbbb'
'39d3fded716d2a7ae0ab03e0896b7497'
- '4bd7305e8b69add8356f9751470cf587')
+ '4bd7305e8b69add8356f9751470cf587'
+ '0ba2b4266f14b19319ece3996be70511')
prepare(){
cd sage-$pkgver
@@ -83,6 +85,8 @@
patch -p1 -i ../is-package-installed.patch
# port to Singular 4 https://trac.sagemath.org/ticket/17254
patch -p1 -i ../sagemath-singular4.patch
+# fix build with cython 0.25
+ patch -p1 -i ../sagemath-cython0.25.patch
# use python2
sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*
@@ -144,7 +148,7 @@
package_sagemath-jupyter() {
pkgdesc='Jupyter kernel for SageMath'
- depends=(sagemath python2-jupyter_client jupyter-widgetsnbextension python-ipywidgets mathjax thebe)
+ depends=(sagemath python2-jupyter_client jupyter-widgetsnbextension python-ipywidgets mathjax)
optdepends=('sage-notebook-exporter: convert flask notebooks to Jupyter')
cd sage-$pkgver/src
Modified: package.patch
===================================================================
--- package.patch 2016-11-05 21:52:12 UTC (rev 194712)
+++ package.patch 2016-11-05 23:46:24 UTC (rev 194713)
@@ -20,11 +20,10 @@
class CythonizeExtension(Extension):
"""
-@@ -75,15 +73,7 @@
- try:
+@@ -76,14 +74,7 @@
condition = kwds.pop("condition")
except KeyError:
-- pkg = kwds.pop("package")
+ pkg = kwds.pop("package")
- try:
- pkginfo = all_packages[pkg]
- except KeyError:
@@ -37,4 +36,3 @@
if condition:
return Extension(*args, **kwds)
else:
-
Added: sagemath-cython0.25.patch
===================================================================
--- sagemath-cython0.25.patch (rev 0)
+++ sagemath-cython0.25.patch 2016-11-05 23:46:24 UTC (rev 194713)
@@ -0,0 +1,30 @@
+--- a/src/setup.py 2016-11-05 19:34:44.701025334 +0000
++++ b/src/setup.py 2016-11-05 19:46:00.706210289 +0000
+@@ -562,16 +562,6 @@
+ import Cython.Compiler.Options
+ import Cython.Compiler.Main
+
+- # Sage uses these directives (mostly for historical reasons).
+- Cython.Compiler.Options.embed_pos_in_docstring = True
+- Cython.Compiler.Options.directive_defaults['autotestdict'] = False
+- Cython.Compiler.Options.directive_defaults['cdivision'] = True
+- Cython.Compiler.Options.directive_defaults['fast_getattr'] = True
+- # The globals() builtin in Cython was fixed to return to the current scope,
+- # but Sage relies on the broken behavior of returning to the nearest
+- # enclosing Python scope (e.g. to perform variable injection).
+- Cython.Compiler.Options.old_style_globals = True
+-
+ debug = False
+ if os.environ.get('SAGE_DEBUG', None) != 'no':
+ print('Enabling Cython debugging support')
+@@ -608,7 +598,10 @@
+ force=force,
+ aliases=aliases,
+ compiler_directives={
++ 'autotestdict': False,
++ 'cdivision': True,
+ 'embedsignature': True,
++ 'fast_getattr': True,
+ 'profile': profile,
+ })
+
More information about the arch-commits
mailing list