[arch-commits] Commit in sagemath-doc/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, October 20, 2018 @ 19:12:24
  Author: arojas
Revision: 398111

Update to 8.4

Modified:
  sagemath-doc/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-20 18:40:54 UTC (rev 398110)
+++ PKGBUILD	2018-10-20 19:12:24 UTC (rev 398111)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=sagemath-doc
-pkgver=8.3
+pkgver=8.4
 pkgrel=1
 pkgdesc="HTML documentation and inline help for SageMath"
 arch=(any)
@@ -10,10 +10,11 @@
 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-doc-sphinx-1.8.patch)
-sha256sums=('41fd0b4eb820f7a1274e12294b6fbdbbf60d0027bff98c22fdc84da140964929'
+        docbuild_main.patch sagemath-doc-sphinx-1.8.patch sagemath-doc-segfault.patch)
+sha256sums=('961a21f60d251531db4b9935cfb6f67f7a207e1029288b4dc5b807f021078ab0'
             'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
-            'f2488c508c3322ad1bdedd56913adbcb4ab964531be95d12a86abb723b9fd25e')
+            'f2488c508c3322ad1bdedd56913adbcb4ab964531be95d12a86abb723b9fd25e'
+            '141ac064305526785fb6d9507896876cbf893cd41ec1e42d86fc836f766c200f')
 
 prepare() {
   cd sage-$pkgver
@@ -25,6 +26,8 @@
   ln -sr src/sage_setup local-python
 # fix build with sphinx 1.8
   patch -p1 -i ../sagemath-doc-sphinx-1.8.patch
+# Partially revert https://trac.sagemath.org/ticket/24655 to workaround a segfault
+  patch -Rp1 -i ../sagemath-doc-segfault.patch
 }
 
 build() {
@@ -34,7 +37,7 @@
   export SAGE_ROOT="/usr"
   export SAGE_SRC="$PWD"
   export SAGE_DOC_SRC="$SAGE_SRC"/doc
-  export SAGE_DOC="$SAGE_SRC"/doc
+  export SAGE_DOC="$SAGE_DOC_SRC"
   export SAGE_DOC_MATHJAX=yes
   export PYTHONPATH="$srcdir"/sage-$pkgver/local-python
   python2 sage_setup/docbuild --no-pdf-links -k all html