[arch-commits] Commit in sagemath-doc/trunk (PKGBUILD sagemath-doc-sphinx-1.8.patch)

[Antonio Rojas]

    Date: Sunday, September 23, 2018 @ 10:55:43
  Author: arojas
Revision: 384195

Fix build with sphinx 1.8

Added:
  sagemath-doc/trunk/sagemath-doc-sphinx-1.8.patch
Modified:
  sagemath-doc/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    7 +++++--
 sagemath-doc-sphinx-1.8.patch |   16 ++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-23 10:15:08 UTC (rev 384194)
+++ PKGBUILD	2018-09-23 10:55:43 UTC (rev 384195)
@@ -10,9 +10,10 @@
 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)
+        docbuild_main.patch sagemath-doc-sphinx-1.8.patch)
 sha256sums=('41fd0b4eb820f7a1274e12294b6fbdbbf60d0027bff98c22fdc84da140964929'
-            'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b')
+            'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
+            'f2488c508c3322ad1bdedd56913adbcb4ab964531be95d12a86abb723b9fd25e')
 
 prepare() {
   cd sage-$pkgver
@@ -22,6 +23,8 @@
 # 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
+# fix build with sphinx 1.8
+  patch -p1 -i ../sagemath-doc-sphinx-1.8.patch
 }
 
 build() {

Added: sagemath-doc-sphinx-1.8.patch
===================================================================
--- sagemath-doc-sphinx-1.8.patch	                        (rev 0)
+++ sagemath-doc-sphinx-1.8.patch	2018-09-23 10:55:43 UTC (rev 384195)
@@ -0,0 +1,16 @@
+diff --git a/src/sage_setup/docbuild/ext/sage_autodoc.py b/src/sage_setup/docbuild/ext/sage_autodoc.py
+index 2c399bad51..96abec3382 100644
+--- a/src/sage_setup/docbuild/ext/sage_autodoc.py
++++ b/src/sage_setup/docbuild/ext/sage_autodoc.py
+@@ -39,8 +39,9 @@ from docutils.statemachine import ViewList
+ import sphinx
+ from sphinx.util import rpartition, force_decode
+ from sphinx.locale import _
+-from sphinx.pycode import ModuleAnalyzer, PycodeError
+-from sphinx.application import ExtensionError
++from sphinx.pycode import ModuleAnalyzer
++from sphinx.errors import ExtensionError, PycodeError
++from sphinx.util.logging import getLogger
+ from sphinx.util.nodes import nested_parse_with_titles
+ from docutils.parsers.rst import Directive
+ from sphinx.util.inspect import getargspec, isdescriptor, safe_getmembers, \