Date: Saturday, August 18, 2018 @ 06:58:25 Author: arojas Revision: 372585
Update to 8.3 Modified: sagemath-doc/trunk/PKGBUILD Deleted: sagemath-doc/trunk/sagemath-sphinx-1.7.patch ---------------------------+ PKGBUILD | 18 +++++------------- sagemath-sphinx-1.7.patch | 13 ------------- 2 files changed, 5 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-18 05:30:04 UTC (rev 372584) +++ PKGBUILD 2018-08-18 06:58:25 UTC (rev 372585) @@ -2,8 +2,8 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=sagemath-doc -pkgver=8.2 -pkgrel=2 +pkgver=8.3 +pkgrel=1 pkgdesc="HTML documentation and inline help for SageMath" arch=(any) url="http://www.sagemath.org" @@ -11,12 +11,9 @@ depends=(python2-sphinx gap-4.8-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-sphinx-1.7.patch - pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch") -sha256sums=('41ba2c2dde7a02e1bb6880ae875d37ab058567cc26e760efe87eeb12188cd65b' - 'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b' - '4c7865deff9d6ad2f9ba807a55b4ffc7e9951f387c2bd438095ab0117c9eaf60' - 'e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9') + docbuild_main.patch) +sha256sums=('41fd0b4eb820f7a1274e12294b6fbdbbf60d0027bff98c22fdc84da140964929' + 'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b') prepare() { cd sage-$pkgver @@ -23,11 +20,6 @@ # 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 ln -sr src/sage_setup local-python Deleted: sagemath-sphinx-1.7.patch =================================================================== --- sagemath-sphinx-1.7.patch 2018-08-18 05:30:04 UTC (rev 372584) +++ sagemath-sphinx-1.7.patch 2018-08-18 06:58:25 UTC (rev 372585) @@ -1,13 +0,0 @@ -diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py -index fada71126c..72eb35ee4c 100644 ---- a/src/sage_setup/docbuild/__init__.py -+++ b/src/sage_setup/docbuild/__init__.py -@@ -99,7 +99,7 @@ def builder_helper(type): - logger.debug(build_command) - - # Run Sphinx with Sage's special logger -- sys.argv = ["sphinx-build"] + build_command.split() -+ sys.argv = build_command.split() - from .sphinxbuild import runsphinx - try: - runsphinx()
