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

[Antonio Rojas]

    Date: Wednesday, January 1, 2020 @ 23:10:28
  Author: arojas
Revision: 545969

Update to 9.0

Modified:
  sagemath-doc/trunk/PKGBUILD
  sagemath-doc/trunk/sagemath-ecl-sigfpe.patch

---------------------------+
 PKGBUILD                  |   12 ++++++------
 sagemath-ecl-sigfpe.patch |   14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-01 23:06:24 UTC (rev 545968)
+++ PKGBUILD	2020-01-01 23:10:28 UTC (rev 545969)
@@ -1,20 +1,20 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=sagemath-doc
-pkgver=8.9
-pkgrel=3
+pkgver=9.0
+pkgrel=1
 pkgdesc="HTML documentation for SageMath"
 arch=(any)
 url="http://www.sagemath.org"
 license=(GPL)
 depends=(gap-doc pplpy-doc)
-makedepends=(sagemath python2-pyzmq python2-docutils python2-jupyter_client python2-pkgconfig cython2 python2-ipywidgets python2-sphinx thebe)
+makedepends=(sagemath python-pyzmq python-docutils python-jupyter_client python-pkgconfig cython python-ipywidgets python-sphinx-1 thebe)
 source=(sagemath-$pkgver.tar.gz::"https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         docbuild_main.patch
         sagemath-ecl-sigfpe.patch)
-sha256sums=('4f9f18a08142fed69342b58ffc6221ec16fe8daf1042086b351e1308489ec5d4'
+sha256sums=('6f5d42b306a2c03073dd95086f80602bd1a0b929b8ad19c6d219c8ca8e96da26'
             'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
-            'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938')
+            'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0')
 
 prepare() {
   cd sage-$pkgver
@@ -39,7 +39,7 @@
          MATHJAX_DIR="/usr/share/mathjax2" \
          PYTHONPATH="$srcdir"/sage-$pkgver/local-python \
          SAGE_NUM_THREADS=10
-  python2 sage_setup/docbuild --no-pdf-links --mathjax all html
+  python sage_setup/docbuild --no-pdf-links --mathjax all html -k
 }
 
 package() {

Modified: sagemath-ecl-sigfpe.patch
===================================================================
--- sagemath-ecl-sigfpe.patch	2020-01-01 23:06:24 UTC (rev 545968)
+++ sagemath-ecl-sigfpe.patch	2020-01-01 23:10:28 UTC (rev 545969)
@@ -2,7 +2,7 @@
 index e408866..fa24ac0 100644
 --- a/src/sage/libs/ecl.pyx
 +++ b/src/sage/libs/ecl.pyx
-@@ -16,7 +16,7 @@ from __future__ import print_function, absolute_import
+@@ -15,7 +15,7 @@ from __future__ import print_function, absolute_import
  #adapted to work with pure Python types.
  
  from libc.stdlib cimport abort
@@ -11,7 +11,7 @@
  from libc.signal cimport raise_ as signal_raise
  from posix.signal cimport sigaction, sigaction_t
  cimport cysignals.signals
-@@ -48,9 +48,14 @@ cdef extern from "eclsig.h":
+@@ -47,9 +47,14 @@ cdef extern from "eclsig.h":
      void ecl_sig_off()
      cdef sigaction_t ecl_sigint_handler
      cdef sigaction_t ecl_sigbus_handler
@@ -26,7 +26,7 @@
  
  cdef cl_object string_to_object(char * s):
      return ecl_read_from_cstring(s)
-@@ -239,6 +244,7 @@ def init_ecl():
+@@ -238,6 +243,7 @@ def init_ecl():
      global ecl_has_booted
      cdef char *argv[1]
      cdef sigaction_t sage_action[32]
@@ -34,7 +34,7 @@
      cdef int i
  
      if ecl_has_booted:
-@@ -258,6 +264,8 @@ def init_ecl():
+@@ -257,6 +263,8 @@ def init_ecl():
      for i in range(1,32):
          sigaction(i, NULL, &sage_action[i])
  
@@ -43,7 +43,7 @@
      #initialize ECL
      ecl_set_option(ECL_OPT_SIGNAL_HANDLING_THREAD, 0)
      cl_boot(1, argv)
-@@ -265,8 +273,12 @@ def init_ecl():
+@@ -264,8 +272,12 @@ def init_ecl():
      #save signal handler from ECL
      sigaction(SIGINT, NULL, &ecl_sigint_handler)
      sigaction(SIGBUS, NULL, &ecl_sigbus_handler)
@@ -56,7 +56,7 @@
      #verify that no SIGCHLD handler was installed
      cdef sigaction_t sig_test
      sigaction(SIGCHLD, NULL, &sig_test)
-@@ -277,6 +289,9 @@ def init_ecl():
+@@ -276,6 +288,9 @@ def init_ecl():
      for i in range(1,32):
          sigaction(i, &sage_action[i], NULL)
  
@@ -66,7 +66,7 @@
      #initialise list of objects and bind to global variable
      # *SAGE-LIST-OF-OBJECTS* to make it rooted in the reachable tree for the GC
      list_of_objects=cl_cons(Cnil,cl_cons(Cnil,Cnil))
-@@ -320,7 +335,6 @@ def init_ecl():
+@@ -319,7 +334,6 @@ def init_ecl():
                      (values nil (princ-to-string cnd)))))
          """))
      safe_funcall_clobj=cl_eval(string_to_object(b"(symbol-function 'sage-safe-funcall)"))