[arch-commits] Commit in coq/trunk (0002-Sphinx-3-support.patch PKGBUILD)

[Jürgen Hötzel]

    Date: Monday, May 18, 2020 @ 17:35:32
  Author: juergen
Revision: 629573

Rebuild/Update to OCaml 4.10.0

Added:
  coq/trunk/0002-Sphinx-3-support.patch
Modified:
  coq/trunk/PKGBUILD

-----------------------------+
 0002-Sphinx-3-support.patch |   46 ++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                    |   12 ++++++----
 2 files changed, 53 insertions(+), 5 deletions(-)

Added: 0002-Sphinx-3-support.patch
===================================================================
--- 0002-Sphinx-3-support.patch	                        (rev 0)
+++ 0002-Sphinx-3-support.patch	2020-05-18 17:35:32 UTC (rev 629573)
@@ -0,0 +1,46 @@
+--- a/doc/tools/coqrst/coqdomain.py
++++ b/doc/tools/coqrst/coqdomain.py
+@@ -21,6 +21,7 @@ from itertools import chain
+ from collections import defaultdict
+ 
+ from docutils import nodes, utils
++from docutils.nodes import math_block
+ from docutils.transforms import Transform
+ from docutils.parsers.rst import Directive, directives
+ from docutils.parsers.rst.roles import code_role #, set_classes
+@@ -34,7 +35,6 @@ from sphinx.util.logging import getLogge
+ from sphinx.directives import ObjectDescription
+ from sphinx.domains import Domain, ObjType, Index
+ from sphinx.domains.std import token_xrefs
+-from sphinx.ext import mathbase
+ 
+ from . import coqdoc
+ from .repl import ansicolors
+@@ -74,8 +74,8 @@ def make_target(objtype, targetid):
+     return "coq:{}.{}".format(objtype, targetid)
+ 
+ def make_math_node(latex, docname, nowrap):
+-    node = mathbase.displaymath()
+-    node['latex'] = latex
++    node = math_block()
++    node['text'] = latex
+     node['label'] = None # Otherwise equations are numbered
+     node['nowrap'] = nowrap
+     node['docname'] = docname
+@@ -1249,11 +1249,11 @@ def setup(app):
+     app.connect('doctree-resolved', CoqtopBlocksTransform.merge_consecutive_coqtop_blocks)
+ 
+     # Add extra styles
+-    app.add_stylesheet("ansi.css")
+-    app.add_stylesheet("coqdoc.css")
+-    app.add_javascript("notations.js")
+-    app.add_stylesheet("notations.css")
+-    app.add_stylesheet("pre-text.css")
++    app.add_css_file("ansi.css")
++    app.add_css_file("coqdoc.css")
++    app.add_js_file("notations.js")
++    app.add_css_file("notations.css")
++    app.add_css_file("pre-text.css")
+ 
+     # Tell Sphinx about extra settings
+     app.add_config_value("report_undocumented_coq_objects", None, 'env')

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-18 17:34:45 UTC (rev 629572)
+++ PKGBUILD	2020-05-18 17:35:32 UTC (rev 629573)
@@ -6,7 +6,7 @@
 # Contributor: William J. Bowman <bluephoenix47 at gmail.com>
 
 pkgname=('coq' 'coqide' 'coq-doc')
-pkgver=8.11.0
+pkgver=8.11.1
 pkgrel=1
 pkgdesc='Formal proof management system'
 arch=('x86_64')
@@ -22,8 +22,9 @@
              'fig2dev' 'imagemagick' 'hevea' 'ghostscript'
              'python' 'python-sphinx' 'python-sphinx_rtd_theme' 'python-pexpect'
              'python-beautifulsoup4' 'python-sphinxcontrib-bibtex' 'python-antlr4')
-source=("coq-${pkgver}.tar.gz::https://github.com/coq/coq/archive/V${pkgver}.tar.gz")
-sha512sums=('db7c3da4bab268cb729bcf9f03f5cd3bbb7a3b5b7094fe2b110189e54e436f9883640db88643d09cec5dc169c209a51661238e41b8de3035ff7ea8561c794c89')
+source=("coq-${pkgver}.tar.gz::https://github.com/coq/coq/archive/V${pkgver}.tar.gz" "0002-Sphinx-3-support.patch")
+sha512sums=('974f09268ca729b525884e02e3179837e31f8001a2c244f138a36a7984329324083e66d07526bba89acaed656eb7711e2c5b257517309d0479839c5d1ac96aa5'
+            '1bcbe09593f90c89f27db97a910b934cdb3af566ca14db887f2f720faedc35922e4048ba833abbb96128cfc1c8dc023843f528c53f488fc8bc68eaeb83fd7658')
 
 prepare() {
   gendesk -f -n --pkgname "coqide" \
@@ -31,6 +32,7 @@
     --pkgdesc "Graphical interface for the Coq proof assistant" \
     --categories "Development;Science;Math;IDE;GTK"
   cd "$srcdir/coq-$pkgver"
+  patch -p1 -i "$srcdir/0002-Sphinx-3-support.patch"
 }
 
 build() {
@@ -42,8 +44,8 @@
     -configdir '/etc/xdg/coq/' \
     -coqide opt \
     -with-doc yes
-
-  make world
+  # https://github.com/coq/coq/issues/12332
+  SPHINXWARNERROR=0 make world
 }
 
 package_coq() {