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

[Antonio Rojas]

    Date: Monday, September 30, 2019 @ 09:47:47
  Author: arojas
Revision: 512155

Update to 8.9

Modified:
  sagemath-doc/trunk/PKGBUILD
Deleted:
  sagemath-doc/trunk/sagemath-doc-segfault.patch

-----------------------------+
 PKGBUILD                    |   11 +++--------
 sagemath-doc-segfault.patch |   14 --------------
 2 files changed, 3 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-30 06:59:44 UTC (rev 512154)
+++ PKGBUILD	2019-09-30 09:47:47 UTC (rev 512155)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=sagemath-doc
-pkgver=8.8
+pkgver=8.9
 pkgrel=1
 pkgdesc="HTML documentation and inline help for SageMath"
 arch=(any)
@@ -11,11 +11,9 @@
 makedepends=(sagemath python2-pyzmq python2-docutils python2-jupyter_client python2-pkgconfig cython2 python2-ipywidgets)
 source=(sagemath-$pkgver.tar.gz::"https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         docbuild_main.patch
-        sagemath-doc-segfault.patch
         sagemath-ecl-sigfpe.patch)
-sha256sums=('d012ff4f0f34e086fcaf576e25220fc647826116c69b62b887bc0b8ced5c1e9f'
+sha256sums=('4f9f18a08142fed69342b58ffc6221ec16fe8daf1042086b351e1308489ec5d4'
             'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
-            '2ee218610001f906015df647881581ff1f7eb0acf923b79b72056965129bac22'
             'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938')
 
 prepare() {
@@ -26,8 +24,6 @@
 # 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 segfault when pari is compiled with threads https://trac.sagemath.org/ticket/26608
-  patch -p1 -i ../sagemath-doc-segfault.patch
 # Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
   patch -p1 -i ../sagemath-ecl-sigfpe.patch
 }
@@ -49,8 +45,7 @@
 package() {
   cd sage-$pkgver/src/doc
  
-  mkdir -p "$pkgdir"/usr/share/doc/sage/en
-  cp -r en/introspect "$pkgdir"/usr/share/doc/sage/en
+  mkdir -p "$pkgdir"/usr/share/doc/sage
   cp -r common "$pkgdir"/usr/share/doc/sage
   cp -r html "$pkgdir"/usr/share/doc/sage
 

Deleted: sagemath-doc-segfault.patch
===================================================================
--- sagemath-doc-segfault.patch	2019-09-30 06:59:44 UTC (rev 512154)
+++ sagemath-doc-segfault.patch	2019-09-30 09:47:47 UTC (rev 512155)
@@ -1,14 +0,0 @@
-diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
-index 5877b5b..7dc8ff7 100644
---- a/src/sage_setup/docbuild/__init__.py
-+++ b/src/sage_setup/docbuild/__init__.py
-@@ -265,7 +265,7 @@ class DocBuilder(object):
-     inventory = builder_helper('inventory')
- 
- 
--if not (CYGWIN_VERSION and CYGWIN_VERSION[0] < 3):
-+if False:
-     def build_many(target, args):
-         # Pool() uses an actual fork() to run each new instance. This is
-         # important for performance reasons, i.e., don't use a forkserver when
-