Date: Tuesday, February 20, 2018 @ 08:58:59 Author: arojas Revision: 296449
Fix build with sphinx 1.7 Added: sagemath-doc/trunk/sagemath-sphinx-1.7.patch Modified: sagemath-doc/trunk/PKGBUILD ---------------------------+ PKGBUILD | 10 ++++++---- sagemath-sphinx-1.7.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-20 07:41:02 UTC (rev 296448) +++ PKGBUILD 2018-02-20 08:58:59 UTC (rev 296449) @@ -9,13 +9,13 @@ url="http://www.sagemath.org" license=(GPL) depends=(python2-sphinx gap-doc thebe) -makedepends=(sage-notebook python2-pyzmq python2-pillow python2-docutils tachyon - python2-jupyter_client python2-pkgconfig cython2 python2-ipywidgets) +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) + docbuild_main.patch sagemath-doc-no-sagenb.patch sagemath-sphinx-1.7.patch) sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b' 'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b' - '261bdb5c24e67fb34f537e29bdf35af655162de3fea7d05abc72f85a864720fe') + '261bdb5c24e67fb34f537e29bdf35af655162de3fea7d05abc72f85a864720fe' + '4c7865deff9d6ad2f9ba807a55b4ffc7e9951f387c2bd438095ab0117c9eaf60') prepare() { cd sage-$pkgver @@ -24,6 +24,8 @@ 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 # use sage_setup imports from sagemath source, but use system sage ones (which include compiled modules) mkdir -p local-python Added: sagemath-sphinx-1.7.patch =================================================================== --- sagemath-sphinx-1.7.patch (rev 0) +++ sagemath-sphinx-1.7.patch 2018-02-20 08:58:59 UTC (rev 296449) @@ -0,0 +1,13 @@ +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()