Date: Sunday, May 6, 2018 @ 12:51:22 Author: arojas Revision: 319016 Update to 8.2
Modified: sagemath-doc/trunk/PKGBUILD Deleted: sagemath-doc/trunk/sagemath-doc-no-sagenb.patch ------------------------------+ PKGBUILD | 17 +++++++++-------- sagemath-doc-no-sagenb.patch | 28 ---------------------------- 2 files changed, 9 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-06 12:12:30 UTC (rev 319015) +++ PKGBUILD 2018-05-06 12:51:22 UTC (rev 319016) @@ -2,8 +2,8 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=sagemath-doc -pkgver=8.1 -pkgrel=3 +pkgver=8.2 +pkgrel=1 pkgdesc="HTML documentation and inline help for SageMath" arch=(any) url="http://www.sagemath.org"; @@ -11,21 +11,22 @@ depends=(python2-sphinx gap-doc thebe) makedepends=(sage-notebook python2-pyzmq python2-docutils python2-jupyter_client python2-pkgconfig cython2 python2-ipywidgets) source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"; - docbuild_main.patch sagemath-doc-no-sagenb.patch sagemath-sphinx-1.7.patch) -sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b' + docbuild_main.patch sagemath-sphinx-1.7.patch + pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch";) +sha256sums=('41ba2c2dde7a02e1bb6880ae875d37ab058567cc26e760efe87eeb12188cd65b' 'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b' - '261bdb5c24e67fb34f537e29bdf35af655162de3fea7d05abc72f85a864720fe' - '4c7865deff9d6ad2f9ba807a55b4ffc7e9951f387c2bd438095ab0117c9eaf60') + '4c7865deff9d6ad2f9ba807a55b4ffc7e9951f387c2bd438095ab0117c9eaf60' + 'e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9') prepare() { cd sage-$pkgver -# drop sage-notebook dependency from sagemath-doc https://trac.sagemath.org/ticket/24250 - patch -p1 -i ../sagemath-doc-no-sagenb.patch # fix relative imports patch -p0 -i ../docbuild_main.patch # fix build with sphinx 1.7 patch -p1 -i ../sagemath-sphinx-1.7.patch +# revert usage of development PARI features + patch -Rp1 -i ../pari-ratpoints.patch # use sage_setup imports from sagemath source, but use system sage ones (which include compiled modules) mkdir -p local-python Deleted: sagemath-doc-no-sagenb.patch =================================================================== --- sagemath-doc-no-sagenb.patch 2018-05-06 12:12:30 UTC (rev 319015) +++ sagemath-doc-no-sagenb.patch 2018-05-06 12:51:22 UTC (rev 319016) @@ -1,28 +0,0 @@ -diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py -index 2e115fa..c4dfbf5 100644 ---- a/src/doc/common/conf.py -+++ b/src/doc/common/conf.py -@@ -1,5 +1,5 @@ - import sys, os, sphinx --from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR -+from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR, SAGE_SHARE - from datetime import date - from six import iteritems - -@@ -219,14 +219,12 @@ if (os.environ.get('SAGE_DOC_MATHJAX', 'no') != 'no' - from sage.misc.latex_macros import sage_mathjax_macros - html_theme_options['mathjax_macros'] = sage_mathjax_macros() - -- from pkg_resources import Requirement, working_set -- sagenb_path = working_set.find(Requirement.parse('sagenb')).location -- mathjax_relative = os.path.join('sagenb','data','mathjax') -+ mathjax_relative = 'mathjax' - - # It would be really nice if sphinx would copy the entire mathjax directory, - # (so we could have a _static/mathjax directory), rather than the contents of the directory - -- mathjax_static = os.path.join(sagenb_path, mathjax_relative) -+ mathjax_static = os.path.join(SAGE_SHARE, mathjax_relative) - html_static_path.append(mathjax_static) - exclude_patterns += ['**/'+os.path.join(mathjax_relative, i) - for i in ('docs', 'README*', 'test',
