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

[Antonio Rojas]

    Date: Thursday, May 21, 2020 @ 09:24:26
  Author: arojas
Revision: 631086

Update to 9.1

Modified:
  sagemath-doc/trunk/PKGBUILD
  sagemath-doc/trunk/sagemath-doc-sphinx-3.patch
Deleted:
  sagemath-doc/trunk/sphinxify-warnings.patch

-----------------------------+
 PKGBUILD                    |   14 ++++++--------
 sagemath-doc-sphinx-3.patch |   10 +++++-----
 sphinxify-warnings.patch    |   16 ----------------
 3 files changed, 11 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-21 07:55:25 UTC (rev 631085)
+++ PKGBUILD	2020-05-21 09:24:26 UTC (rev 631086)
@@ -1,8 +1,8 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=sagemath-doc
-pkgver=9.0
-pkgrel=4
+pkgver=9.1
+pkgrel=1
 pkgdesc="HTML documentation for SageMath"
 arch=(any)
 url="http://www.sagemath.org"
@@ -12,15 +12,13 @@
 source=(sagemath-$pkgver.tar.gz::"https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         docbuild_main.patch
         sagemath-ecl-sigfpe.patch
-        sphinxify-warnings.patch
         sagemath-matplotlib-3.2.patch
         sagemath-doc-sphinx-3.patch)
-sha256sums=('6f5d42b306a2c03073dd95086f80602bd1a0b929b8ad19c6d219c8ca8e96da26'
+sha256sums=('07f3da5ca3e48f92c5a55b690408a3c87642689c28675a1f25b55a0f48ce5023'
             'ea5e17bb7a7cb36a22e5e3872fcc2585852bc971c4b139b0b2cd69a36c1b009b'
             'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0'
-            '99fc7f393d5ee2687573c0ef6bf5ecb75077e415aa0605af3766824fa11aafd6'
             '979777363001cca87f73128dd4db5f372fc9e4f1079805a20af01df47797468f'
-            '7efe6f95a9c9f5513e3dc90d43e832161e4eb0af67236b1c1c9f7474037c6423')
+            '5576d2702a12b6c65e40bf1bdefe9a7f595e6c57fc6ff003903ce0f21643f64b')
 options=(!strip)
 
 prepare() {
@@ -33,12 +31,12 @@
   ln -sr src/sage_setup local-python
 # Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
   patch -p1 -i ../sagemath-ecl-sigfpe.patch
-# Fix sphinxify deprecation warnings
-  patch -p1 -i ../sphinxify-warnings.patch
 # Fix warnings with matplotlib 3.2
   patch -p1 -i ../sagemath-matplotlib-3.2.patch
 # Fix build with sphinx 3.0
   patch -p1 -i ../sagemath-doc-sphinx-3.patch
+
+  SAGE_ROOT="$PWD" PATH="$PWD/build/bin:$PATH" src/doc/bootstrap
 }
 
 build() {

Modified: sagemath-doc-sphinx-3.patch
===================================================================
--- sagemath-doc-sphinx-3.patch	2020-05-21 07:55:25 UTC (rev 631085)
+++ sagemath-doc-sphinx-3.patch	2020-05-21 09:24:26 UTC (rev 631086)
@@ -37,7 +37,7 @@
  from IPython.lib.lexers import IPythonConsoleLexer, IPyLexer
  
  # If your extensions are in another directory, add it here.
-@@ -169,13 +170,8 @@ todo_include_todos = True
+@@ -173,13 +174,8 @@ todo_include_todos = True
  
  # Cross-links to other project's online documentation.
  python_version = sys.version_info.major
@@ -52,7 +52,7 @@
      """
      Add precompiled inventory (the objects.inv)
      """
-@@ -186,7 +182,11 @@ def set_intersphinx_mappings(app):
+@@ -190,7 +186,11 @@ def set_intersphinx_mappings(app):
          app.config.intersphinx_mapping = {}
          return
  
@@ -65,7 +65,7 @@
  
      # Add master intersphinx mapping
      dst = os.path.join(invpath, 'objects.inv')
-@@ -201,6 +201,7 @@ def set_intersphinx_mappings(app):
+@@ -205,6 +205,7 @@ def set_intersphinx_mappings(app):
              dst = os.path.join(invpath, directory, 'objects.inv')
              app.config.intersphinx_mapping[src] = dst
  
@@ -73,7 +73,7 @@
  
  # By default document are not master.
  multidocs_is_master = True
-@@ -669,7 +670,7 @@ def call_intersphinx(app, env, node, contnode):
+@@ -673,7 +674,7 @@ def call_intersphinx(app, env, node, contnode):
      """
      debug_inf(app, "???? Trying intersphinx for %s" % node['reftarget'])
      builder = app.builder
@@ -82,7 +82,7 @@
          app, env, node, contnode)
      if res:
          # Replace absolute links to $SAGE_DOC by relative links: this
-@@ -852,11 +853,10 @@ def setup(app):
+@@ -856,11 +857,10 @@ def setup(app):
      if app.srcdir.startswith(SAGE_DOC_SRC):
          app.add_config_value('intersphinx_mapping', {}, False)
          app.add_config_value('intersphinx_cache_limit', 5, False)

Deleted: sphinxify-warnings.patch
===================================================================
--- sphinxify-warnings.patch	2020-05-21 07:55:25 UTC (rev 631085)
+++ sphinxify-warnings.patch	2020-05-21 09:24:26 UTC (rev 631086)
@@ -1,16 +0,0 @@
-diff --git a/src/doc/common/themes/sage/search.html b/src/doc/common/themes/sage/search.html
-index 88d5813bea..9fd5017991 100644
---- a/src/doc/common/themes/sage/search.html
-+++ b/src/doc/common/themes/sage/search.html
-@@ -9,7 +9,10 @@
- #}
- {% extends "layout.html" %}
- {% set title = _('Search') %}
--{% set script_files = script_files + ['_static/searchtools.js'] %}
-+{%- block scripts %}
-+    {{ super() }}
-+    <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
-+{%- endblock %}
- {% block extrahead %}
-   <script type="text/javascript">
-     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });