[arch-commits] Commit in sagemath/trunk (4 files)
Date: Saturday, March 9, 2019 @ 13:48:16
Author: arojas
Revision: 438247
GAP 4.10.1 rebuild
Added:
sagemath/trunk/sagemath-gap-4.10.1.patch
sagemath/trunk/sagemath-singular-4.1.2.patch
(from rev 438246, sagemath/trunk/sagemath-singular-4.1.1.p4.patch)
Modified:
sagemath/trunk/PKGBUILD
Deleted:
sagemath/trunk/sagemath-singular-4.1.1.p4.patch
--+
PKGBUILD | 18 +++---
sagemath-gap-4.10.1.patch| 31 +++
sagemath-singular-4.1.1.p4.patch | 78
sagemath-singular-4.1.2.patch| 102 +
4 files changed, 144 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-09 13:39:42 UTC (rev 438246)
+++ PKGBUILD2019-03-09 13:48:16 UTC (rev 438247)
@@ -8,7 +8,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=8.6
-pkgrel=5
+pkgrel=6
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab"
arch=(x86_64)
url="http://www.sagemath.org";
@@ -45,9 +45,10 @@
sagemath-cremona.patch
sagemath-sphinx-1.8.patch
sagemath-cypari2.patch
-sagemath-singular-4.1.1.p4.patch
+sagemath-singular-4.1.2.patch
sagemath-ecl-sigfpe.patch
-sagemath-numpy-1.16.patch)
+sagemath-numpy-1.16.patch
+sagemath-gap-4.10.1.patch)
sha256sums=('dea613fc955cada76aaa7ab379bc5a219fe8b496064824f8c798b2b1651442fa'
'de6e38462ef1848778fbc23a63529fbee9229dbb245bb653f58a0d834a634c04'
'960afe4fcbffe2762b66119b8f14355386ced0d8ee52b535d0dac1dba90d365b'
@@ -59,9 +60,10 @@
'4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96'
'22f5e44a42c8276025b8512f45cac1c36d576c29c7fd9d36fde8b19ff87867d8'
'ca47248d2ed5edfe663ea02e261ddbb26a7cb03bef67928dbec690d9b9a8f129'
-'482887fe43d89cef3270e89300ab9e2238fa74cd5b7c875688b68fb1b10c4fdf'
+'961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9'
'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
-'d483b1dc78eb83e3cd1620e3d44214ca0704065e1d27d7a257976e56c85f2d5b')
+'d483b1dc78eb83e3cd1620e3d44214ca0704065e1d27d7a257976e56c85f2d5b'
+'ea7148347107ad90306c51c66b2fe522e1e99abed0546b7780b1b346261929bc')
prepare(){
cd sage-$pkgver
@@ -81,6 +83,8 @@
patch -p1 -i ../sagemath-threejs.patch
# fix introspection with sphinx 1.8
patch -p1 -i ../sagemath-sphinx-1.8.patch
+# port to GAP 4.10.1 API changes
+ patch -p1 -i ../sagemath-gap-4.10.1.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -89,8 +93,8 @@
patch -p1 -i ../sagemath-cremona.patch
# Fix build with cypari 2.0 https://trac.sagemath.org/ticket/26442
patch -p1 -i ../sagemath-cypari2.patch
-# Fixes for singular 4.1.1p4 https://trac.sagemath.org/ticket/25993
- patch -p1 -i ../sagemath-singular-4.1.1.p4.patch
+# Fixes for singular 4.1.2 https://trac.sagemath.org/ticket/25993
+ patch -p1 -i ../sagemath-singular-4.1.2.patch
# Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
patch -p1 -i ../sagemath-ecl-sigfpe.patch
# Fix inline fortran with numpy 1.16 https://trac.sagemath.org/ticket/27061
Added: sagemath-gap-4.10.1.patch
===
--- sagemath-gap-4.10.1.patch (rev 0)
+++ sagemath-gap-4.10.1.patch 2019-03-09 13:48:16 UTC (rev 438247)
@@ -0,0 +1,31 @@
+diff --git a/src/sage/libs/gap/gap_includes.pxd
b/src/sage/libs/gap/gap_includes.pxd
+index 864a13b385..8a2c22ed4a 100644
+--- a/src/sage/libs/gap/gap_includes.pxd
b/src/sage/libs/gap/gap_includes.pxd
+@@ -77,8 +77,8 @@ cdef extern from "":
+
+ cdef extern from "":
+ ctypedef void (*CallbackFunc)()
+-void GAP_Initialize(int argc, char ** argv, char ** env,
+-CallbackFunc, CallbackFunc)
++void GAP_Initialize(int argc, char ** argv,
++CallbackFunc, CallbackFunc, int handleSignals)
+ Obj GAP_EvalString(const char *) except *
+ Obj GAP_EvalStringNoExcept "GAP_EvalString"(const char *)
+ Obj GAP_ValueGlobalVariable(const char *)
+diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
+index 97c383fdbe..20ecc82976 100644
+--- a/src/sage/libs/gap/util.pyx
b/src/sage/libs/gap/util.pyx
+@@ -320,8 +320,8 @@
+ # Need to save/restore current SIGINT handling since
GAP_Initialize
+ # currently clobbers it; it doesn't matter what we set SIGINT to
+ # temporarily.
+-GAP_Initialize(argc, argv, env, &gasman_callback,
+- &error_handler)
++GAP_Initialize(argc, argv, &gasman_callback,
++ &error_handler, 1)
+ except RuntimeError as msg:
+
[arch-commits] Commit in sagemath/trunk (4 files)
Date: Saturday, July 7, 2018 @ 10:15:57
Author: arojas
Revision: 353942
Make sure to use GAP 4.8
Added:
sagemath/trunk/sagemath-gap-4.8.patch
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/sagemath-env.patch
sagemath/trunk/sagemath-singular-4.1.1.patch
---+
PKGBUILD | 13 -
sagemath-env.patch|4 ++--
sagemath-gap-4.8.patch| 31 +++
sagemath-singular-4.1.1.patch |2 +-
4 files changed, 42 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-07-07 09:46:49 UTC (rev 353941)
+++ PKGBUILD2018-07-07 10:15:57 UTC (rev 353942)
@@ -9,7 +9,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=8.2
-pkgrel=7
+pkgrel=8
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab"
arch=(x86_64)
url="http://www.sagemath.org";
@@ -24,7 +24,7 @@
'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'
'ffmpeg: to export animations to video' 'imagemagick: to show animations'
- 'coxeter: Coxeter groups implementation' 'cryptominisat5: SAT solver'
'gap-data: for computing Galois groups'
+ 'coxeter: Coxeter groups implementation' 'cryptominisat5: SAT solver'
'gap-4.8-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'
'libfes: exhaustive search of solutions for boolean equations'
'python2-pynormaliz: Normaliz backend for polyhedral computations'
@@ -38,10 +38,10 @@
sagemath-env.patch package.patch latte-count.patch jupyter-path.patch
sagemath-python3-notebook.patch test-optional.patch
r-no-readline.patch fes02.patch sagemath-threejs.patch
sagemath-ignore-warnings.patch
sagemath-detect-igraph.patch sagemath-networkx2.patch
sagemath-scipy-1.0.patch sagemath-lrs.patch
-sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch
+sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch
sagemath-gap-4.8.patch
pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch";)
sha256sums=('41ba2c2dde7a02e1bb6880ae875d37ab058567cc26e760efe87eeb12188cd65b'
-'6f95ef6960acb3b368bc6245783d88fcadaa63537e1bf9f41d8d91b28e95ddf9'
+'b3c5f5c159d72ba7bc2b186b7b0e50a02b1ca60caef49b3857dbaad3da36b6fc'
'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
'0b680e674c11c47afa86162d8b49645620b8912722e08133d23357c29ca9310a'
'2cad308f8adbb6c54e6603fa22b2f0eb60f6f09248d5d015000c3932ac14f646'
@@ -55,8 +55,9 @@
'8253730940687992dd29d90d95bea7e2685bb4854db004090c8196ce92859b64'
'17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a'
'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c'
-'11a68f156647ba9f38cb01b2a5e4f9a6a78f6297f2a5a65fbfdfe32d4be69d0c'
+'507bf761df222d1961d53ebeaf8e6a5a3dc2d7b9cb78748d71ed8cb1ee1c4ac6'
'5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0'
+'6917cb74e50ae965ea8d7c39577e5f0a5068e4b6a67b53fc6f219149a7d06584'
'e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9')
prepare(){
@@ -98,6 +99,8 @@
patch -Rp1 -i ../pari-ratpoints.patch
# don't force c++98 for lcalc (fixes build with NTL 11)
patch -p1 -i ../sagemath-lcalc-c++11.patch
+# Adjust paths for gap-4.8
+ patch -p1 -i ../sagemath-gap-4.8.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
Modified: sagemath-env.patch
===
--- sagemath-env.patch 2018-07-07 09:46:49 UTC (rev 353941)
+++ sagemath-env.patch 2018-07-07 10:15:57 UTC (rev 353942)
@@ -85,7 +85,7 @@
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
-export SAGE_SRC="$SAGE_ROOT/src"
-export SAGE_DOC_SRC="$SAGE_SRC/doc"
-+export GAP_ROOT_DIR="/usr/lib/gap"
++export GAP_ROOT_DIR="/usr/lib/gap-4.8"
+export SAGE_SRC="$SAGE_LOCAL/lib/python2.7/site-packages"
+export SAGE_DOC_SRC="$SAGE_SHARE/doc/sage"
export SAGE_DOC="$SAGE_SHARE/doc/sage"
@@ -143,7 +143,7 @@
_add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves'))
_add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes'))
-_add_variable_or_fallback('GAP_ROOT_DIR',
opj('$SAGE_LOCAL','gap','latest'))
-+_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','lib','gap'))
++_add_variable_or_fallback('GAP_R
[arch-commits] Commit in sagemath/trunk (4 files)
Date: Saturday, June 3, 2017 @ 13:56:50
Author: arojas
Revision: 233756
pynac 0.7.8 rebuild, fix build with singular 4.1.0.p3
Added:
sagemath/trunk/sagemath-singular-4.1.0.p3.patch
(from rev 218951, sagemath/trunk/sagemath-singular-4.1.0.p2.patch)
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/sagemath-singular-4.1.0.p2.patch
Deleted:
sagemath/trunk/is-package-installed.patch
--+
PKGBUILD | 17
is-package-installed.patch | 328
sagemath-singular-4.1.0.p2.patch | 758 -
sagemath-singular-4.1.0.p3.patch | 118 +
4 files changed, 877 insertions(+), 344 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-03 13:56:43 UTC (rev 233755)
+++ PKGBUILD2017-06-03 13:56:50 UTC (rev 233756)
@@ -10,7 +10,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=7.6
-pkgrel=4
+pkgrel=5
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab"
arch=(i686 x86_64)
url="http://www.sagemath.org";
@@ -34,14 +34,13 @@
makedepends=(cython2 boost ratpoints symmetrica python2-jinja coin-or-cbc
libhomfly libbraiding
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 latte-count.patch
+env.patch skip-check.patch cython-sys-path.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-pynac-0.7.6.patch)
+sagemath-planarity3.patch fes02.patch sagemath-singular-4.1.0.p2.patch
sagemath-singular-4.1.0.p3.patch sagemath-pynac-0.7.6.patch)
sha256sums=('e6e0729ab25446e7c922058db0eee4b0b294b32c196e34842e843ea9fae41423'
'dc0a92b81e9e2faab05cf8a5adb40ae7010be74446bc80d5aea15f59706f2cff'
'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04'
'ff7e034d08ab084fdb193484f7fe3a659ebcd8ab33a2b7177237d65b26de7872'
-'d60fb0fbd27991ce9496ca035a54b03334b5b53f244227a8d6e13f3327ce75d2'
'4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212'
'b816c71d345fb1188c3faa01c4e75cfa04ba6506080231d5d2c303a2288e9b50'
'775051aa9076ebf631c8a291af38b6ec4a13c904740dc9da831641d592d8bcd8'
@@ -52,7 +51,8 @@
'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7'
'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
-'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7'
+'e2980048e51a81a8f60761c0ea66c81b4e36d75198de2f4e5f0d5e4fd5ef5172'
+'18ea03c046435693a9008329bb725a9cf2ed0d88a0d731bc71b5586bf84dfddf'
'42d6549d9a07bcea9fa79bb63961ebbfaaa4ca64e9c6a402ae90d559bb256c12')
prepare(){
@@ -79,8 +79,9 @@
patch -p1 -i ../r-no-readline.patch
# fix build with planarity 3 (Debian)
patch -p2 -i ../sagemath-planarity3.patch
-# fix build with Singular 4.1.0-p2
- patch -p0 -i ../sagemath-singular-4.1.0.p2.patch
+# fix build with Singular 4.1.0-p3
+ patch -p1 -i ../sagemath-singular-4.1.0.p2.patch
+ patch -p1 -i ../sagemath-singular-4.1.0.p3.patch
# use correct latte-count binary name
patch -p1 -i ../latte-count.patch
# make 'sage -notebook=jupyter' work with our python3 jupyter-notebook package
@@ -89,8 +90,6 @@
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
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
Deleted: is-package-installed.patch
===
--- is-package-installed.patch 2017-06-03 13:56:43 UTC (rev 233755)
+++ is-package-installed.patch 2017-06-03 13:56:50 UTC (rev 233756)
@@ -1,328 +0,0 @@
-diff --git a/src/sage/databases/cremona.py b/src/sage/databases/cremona.py
-index 0a5f794..2969d92 100644
a/src/sage/databases/cremona.py
-+++ b/src/sage/databases/cremona.py
-@@ -53,7 +53,6 @@ from sage.misc.prandom import randint
-
- import sage.schemes.elliptic_curves.constructor as elliptic
- from .sql_db import SQLDatabase, verify_column
--from sage.misc.package import is_package_installed
- from sage.env import SAGE_SHARE
- from sage.misc.all import walltime
-
-@@ -824,7 +823,7 @@ class MiniCremonaData
[arch-commits] Commit in sagemath/trunk (4 files)
Date: Sunday, January 29, 2017 @ 11:18:40
Author: arojas
Revision: 209347
Reenable fes module, fix build with planarity 3
Added:
sagemath/trunk/fes02.patch
sagemath/trunk/sagemath-planarity3.patch
Modified:
sagemath/trunk/PKGBUILD
Deleted:
sagemath/trunk/disable-fes.patch
---+
PKGBUILD | 18 +++
disable-fes.patch | 19 ---
fes02.patch | 57 ++
sagemath-planarity3.patch | 113
4 files changed, 180 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-29 11:13:17 UTC (rev 209346)
+++ PKGBUILD2017-01-29 11:18:40 UTC (rev 209347)
@@ -10,7 +10,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=7.5.1
-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";
@@ -28,13 +28,13 @@
'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'
- 'python2-pynormaliz: Normaliz backend for polyhedral computations')
+ 'libfes: exhaustive search of solutions for boolean equations'
'python2-pynormaliz: Normaliz backend for polyhedral computations')
makedepends=(cython2 boost ratpoints symmetrica python2-jinja coin-or-cbc
libhomfly libbraiding
- mcqd coxeter3 cryptominisat2 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 ecm-7.patch increase-rtol.patch
sagemath-gslcblas.patch r-no-readline.patch
-sagemath-no-anal.h.patch)
+sagemath-no-anal.h.patch sagemath-planarity3.patch fes02.patch)
sha256sums=('3cd9af3e3bfd7f5cc966b7c36168d04b9a1213aa9a7af3286b5d53d40e7653e3'
'9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635'
'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04'
@@ -48,7 +48,9 @@
'be925eefeac3f28e639794ddc20d64e6faafd7181804e29417a510224d19ccc7'
'973224f53e9a6fcfaa9c6cb842b02430a601d1c7ce0abb41b3591470d128930c'
'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
-'8126c92a5fc15738c4f7982aadb5a4033230fc2d5da05af9133a96ad1181419e')
+'8126c92a5fc15738c4f7982aadb5a4033230fc2d5da05af9133a96ad1181419e'
+'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7'
+'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea')
prepare(){
cd sage-$pkgver
@@ -74,12 +76,12 @@
patch -p1 -i ../sagemath-gslcblas.patch
# fix freezes in R interface with readline 7 (Debian)
patch -p1 -i ../r-no-readline.patch
+# fix build with planarity 3 (Debian)
+ patch -p2 -i ../sagemath-planarity3.patch
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
-# patch -p0 -i ../fes02.patch
-# disable fes module, fails to compile
- patch -p0 -i ../disable-fes.patch
+ patch -p1 -i ../fes02.patch
# replace is_package_installed usage http://trac.sagemath.org/ticket/20377
patch -p1 -i ../is-package-installed.patch
# Allow compiling without pari's anal.h https://trac.sagemath.org/ticket/22195
Deleted: disable-fes.patch
===
--- disable-fes.patch 2017-01-29 11:13:17 UTC (rev 209346)
+++ disable-fes.patch 2017-01-29 11:18:40 UTC (rev 209347)
@@ -1,19 +0,0 @@
src/module_list.py.orig2015-06-07 11:29:30.710612146 +0200
-+++ src/module_list.py 2015-06-07 11:30:21.877506106 +0200
-@@ -564,11 +564,11 @@
- sources = ["sage/libs/ecl.pyx"],
- libraries = ["ecl"]),
-
--OptionalExtension("sage.libs.fes",
-- ["sage/libs/fes.pyx"],
-- language = "c",
-- libraries = ['fes'],
-- package = 'fes'),
-+#OptionalExtension("sage.libs.fes",
-+# ["sage/libs/fes.pyx"],
-+# language = "c",
-+# libraries = ['fes'],
-+# package = 'fes'),
-
- Extension('sage.libs.flint.flint',
- sources = ["sage/libs/flint/flint.pyx"],
Added: fes02.patch
===
--- fes02.patch (rev 0)
+++ fes02.patch 2017-01-29 11
[arch-commits] Commit in sagemath/trunk (4 files)
Date: Friday, August 5, 2016 @ 11:39:38
Author: arojas
Revision: 185270
Update ipython 5 patch
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/env.patch
sagemath/trunk/paths.patch
sagemath/trunk/sagemath-ipython5.patch
-+
PKGBUILD| 10
env.patch | 48
paths.patch | 23 --
sagemath-ipython5.patch | 480 +++---
4 files changed, 469 insertions(+), 92 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-08-05 11:21:56 UTC (rev 185269)
+++ PKGBUILD2016-08-05 11:39:38 UTC (rev 185270)
@@ -9,7 +9,7 @@
pkgname=sagemath
pkgver=7.3
-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";
@@ -27,7 +27,7 @@
'coxeter3: Coxeter groups implementation' 'cryptominisat: 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'
- 'python2-igraph: igraph backend for graph theory' 'sage-notebook-export:
convert flask notebooks to jupyter'
+ 'python2-igraph: igraph backend for graph theory' 'sage-notebook-exporter:
convert flask notebooks to jupyter'
'jupyter-notebook: Jupyter notebook interface')
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
@@ -39,8 +39,8 @@
disable-fes.patch jupyter-path.patch test-optional.patch
python-2.7.11.patch linbox-1.4.patch ecm-7.patch sagemath-ipython5.patch)
md5sums=('cb2aed3d24de7b2228a9b34e81a27870'
'a906a180d198186a39820b0a2f9a9c63'
- '4c8ddf07861abe703816e045e9e22de0'
- '6f4dd6ec97affa2ce9a00ddf7e35db4c'
+ 'd4d3c235c99b2bc92dde9f6e53935a8d'
+ '45b84ae5579273196df44f7464a01a30'
'6d9ae0978ce6a05a0da2cafdfb178a09'
'6cafcb381437d4751fd55b25d5090987'
'a1bcdd3fe620dbae60ed8b0e98b2ece7'
@@ -52,7 +52,7 @@
'ef927896f2071b442b1d07d7e69f5f3a'
'a276f0fbbff6eade409d0569ebd728d4'
'0c9a57d35de80c2cd418ebec912efbbb'
- 'abf4a70811d4f19191348202a923fe4b')
+ '2bcaca7284dda963ebdc17daf78cf6c9')
prepare(){
cd sage-$pkgver
Modified: env.patch
===
--- env.patch 2016-08-05 11:21:56 UTC (rev 185269)
+++ env.patch 2016-08-05 11:39:38 UTC (rev 185270)
@@ -70,11 +70,11 @@
+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.
- # Since the user might do something crazy we do not do any checks, but hope
for the best.
-@@ -309,9 +267,6 @@
- GIT_TEMPLATE_DIR="$SAGE_LOCAL"/share/git-core/templates && export
GIT_TEMPLATE_DIR
- GIT_EXEC_PATH="$SAGE_LOCAL"/libexec/git-core && export GIT_EXEC_PATH
+ if [ "$SAGE_BANNER" = "bare" ]; then
+ export SAGE_BANNER_TEXT=$(cat "$SAGE_ROOT/VERSION.txt")
+@@ -319,9 +277,6 @@
+ GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
+ GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR
-SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
-SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
@@ -82,7 +82,7 @@
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
export SAGE_REPO_ANONYMOUS
-@@ -363,38 +318,33 @@
+@@ -364,10 +319,10 @@
export SAGE_STARTUP_FILE
fi
@@ -97,39 +97,7 @@
if [ "$PYTHON_EGG_CACHE" = "" ]; then
PYTHON_EGG_CACHE="$DOT_SAGE/.python-eggs"
- export PYTHON_EGG_CACHE
- fi
-
- # Set PYTHONUSERBASE to avoid picking up non-Sage versions of
- # Matplotlib, numpy, etc. See http://trac.sagemath.org/ticket/19612.
- #
- # For more history (it used to be PYTHONNOUSERSITE=yes which killed
- # the ability to do "sage -pip install PACKAGE --user"), see
- # http://trac.sagemath.org/ticket/14243 and
- # http://trac.sagemath.org/ticket/18955.
-
- if [ "$PYTHONUSERBASE" = "" ]; then
- PYTHONUSERBASE="$DOT_SAGE/local"
- export PYTHONUSERBASE
- fi
-
--if [ -d "$SAGE_LOCAL/lib/python" ]; then
--PYTHONPATH="$SAGE_LOCAL/lib/python:$SAGE_LOCAL/lib/python/site_packages"
--if [ -n "$SAGE_PATH" ]; then
--PYTHONPATH="$SAGE_PATH:$PYTHONPATH"
--fi
--PYTHONHOME="$SAGE_LOCAL"
--export PYTHONPATH
--export PYTHONHOME
--fi
-+PYTHONPATH="/usr/lib/sage/site-packages:$PYTHONPATH"
-+PYTHONHOME="$SAGE_ROOT"
-+export PYTHONPATH
-+export PYTHONHOME
-
- if [ -z "${SAGE_ORIG_LD_LIBRARY_PATH_SET}" ]; then
- SAGE
[arch-commits] Commit in sagemath/trunk (4 files)
Date: Saturday, October 24, 2015 @ 11:23:52
Author: arojas
Revision: 144863
NTL 9.5 & pari-sage 2.8.1813 rebuild
Rename sources dir to "source", src breaks lazy imports for some reason
Use upstream provided jupyter kernel
Added:
sagemath/trunk/jupyter-path.patch
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/env.patch
Deleted:
sagemath/trunk/kernel.json
+
PKGBUILD | 44 +++-
env.patch |2 +-
jupyter-path.patch | 22 ++
kernel.json|1 -
4 files changed, 46 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-10-24 08:42:01 UTC (rev 144862)
+++ PKGBUILD2015-10-24 09:23:52 UTC (rev 144863)
@@ -9,7 +9,7 @@
pkgname=sagemath
pkgver=6.9
-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";
@@ -30,22 +30,27 @@
replaces=(sage-mathematics)
provides=(sage-mathematics)
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";
-"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2";
'kernel.json'
-'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch'
'skip-check.patch'
-'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch')
+ "http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2";
+ 'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch'
'skip-check.patch'
+ 'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch'
'jupyter-path.patch'
+
pari-sage-2.8.1813.patch::"http://git.sagemath.org/sage.git/patch/?id=c1f5aa26e";
+
jupyter-kernel.patch::"http://git.sagemath.org/sage.git/patch/?id=4f06d3df";
+
relative-links.patch::"http://git.sagemath.org/sage.git/patch/src/sage/repl/ipython_kernel/kernel.py?id=52a717a7";)
md5sums=('847ad447eaef17b2bc81bb4fae69c190'
'd9a3e113ed147dcee8f89962a8dccd43'
- '4cee4f96bcd877587e7efc40c20adba7'
'a906a180d198186a39820b0a2f9a9c63'
'9ba81f717ffd4e20b8b2f2a318307488'
- '5ebdb6e6ac541f040a39f8d3fd9c8ee1'
+ 'e1b1d0d2e6b187309ae2b74489356b9a'
'fd8e3e07f5b7318e6a7200a3c64f5bc2'
'23e972753be1e5d0f761a7f82a95cebf'
'5947a420a0b1483f0cbc74c76895789b'
'a83a3b1bc7fcb7cbf752a83a8311fc42'
'f333939ea6c41377b66407c81016cee4'
- '4eb23a3c7363258bc9ba764d6e5512ba')
+ '4eb23a3c7363258bc9ba764d6e5512ba'
+ '5dd1cc8852b9d89cc8be98340c9bb44e'
+ '01229c3dabbb5fe13348d8c8c31da710'
+ 'f91e760a251fe1042fa9f2aad68b6b02'
+ 'fe3c5ef5b30a19c632d7fad0ee58c7c4')
prepare(){
cd sage-$pkgver
@@ -72,8 +77,6 @@
-i src/sage/databases/cremona.py
# find bliss headers
sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx
-# fix opening docs from Jupyter notebook
- sed -e "s|SageKernelSpec.identifier()|'SageMath'|g" -i
src/sage/repl/ipython_kernel/kernel.py
# Upstream patches
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -80,6 +83,13 @@
# patch -p0 -i "$srcdir"/fes02.patch
# disable fes module, fails to compile
patch -p0 -i ../disable-fes.patch
+# port to pari-sage 2.8.1813
+ patch -p1 -i ../pari-sage-2.8.1813.patch
+# install jupyter kernel
+ patch -p1 -i ../relative-links.patch
+ patch -p1 -i ../jupyter-kernel.patch
+# set jupyter path
+ patch -p0 -i ../jupyter-path.patch
# use python2
sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec
python|exec python2|' -i src/bin/*
@@ -127,6 +137,8 @@
export SAGE_ROOT="/usr"
export SAGE_LOCAL="$SAGE_ROOT"
export SAGE_SRC="$PWD"
+ export SAGE_EXTCODE="$SAGE_SRC"/ext
+ export JUPYTER_PATH="$pkgdir"/usr/share/jupyter
python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
@@ -144,7 +156,7 @@
cp -r ext "$pkgdir"/usr/share/sage
# Create SAGE_SRC, needed for the notebook
- mkdir "$pkgdir"/usr/share/sage/src
+ mkdir "$pkgdir"/usr/share/sage/source
# Install Sage's own pexpect
cd "$srcdir"/pexpect-2.0
@@ -151,14 +163,4 @@
python2 setup.py install --root="$pkgdir" --optimize=1
mkdir -p "$pkgdir"/usr/lib/sage/site-packages/
mv "$pkgdir"/usr/lib/python2.7/site-packages/pexpect*
"$pkgdir"/usr/lib/sage/site-packages/
-
-# Install Jupyter kernel
- install -Dm644 "$srcdir"/kernel.json
"$pkgdir"/usr/share/jupyter/kernels/sagemath/kernel.json
- cd "$pkgdir"/usr/share/jupyter/kernels/sagemath
- ln -s /usr/share/doc/sage/output/html/en doc
- ln -s /usr/share/sage/ext/notebook-ipython/logo.svg .
- ln -s /usr/share/sage/ext/notebook-ipython/logo-64x64.png .
-
- mkdir "$pkgdir"/usr/share/jupyter/nbextensions
- ln -s /usr/share/{jsmol,mathjax}
[arch-commits] Commit in sagemath/trunk (4 files)
Date: Wednesday, April 29, 2015 @ 21:03:48 Author: arojas Revision: 132523 Add patches to SVN Added: sagemath/trunk/3d_options.patch sagemath/trunk/dont_inspect_cython_cached_methods.patch sagemath/trunk/embed_signatures.patch sagemath/trunk/refactor_show.patch --+ 3d_options.patch | 120 ++ dont_inspect_cython_cached_methods.patch | 260 ++ embed_signatures.patch | 682 +++ refactor_show.patch | 1256 + 4 files changed, 2318 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 132522:132523 to see the changes.
