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

[Baptiste Jonglez]

    Date: Saturday, July 25, 2020 @ 10:51:25
  Author: zorun
Revision: 665260

upgpkg: coq 8.12.0-1

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

-----------------------------+
 0002-Sphinx-3-support.patch |   46 ------------------------------------------
 PKGBUILD                    |    9 ++------
 2 files changed, 3 insertions(+), 52 deletions(-)

Deleted: 0002-Sphinx-3-support.patch
===================================================================
--- 0002-Sphinx-3-support.patch	2020-07-25 10:16:14 UTC (rev 665259)
+++ 0002-Sphinx-3-support.patch	2020-07-25 10:51:25 UTC (rev 665260)
@@ -1,46 +0,0 @@
---- 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-07-25 10:16:14 UTC (rev 665259)
+++ PKGBUILD	2020-07-25 10:51:25 UTC (rev 665260)
@@ -6,7 +6,7 @@
 # Contributor: William J. Bowman <bluephoenix47 at gmail.com>
 
 pkgname=('coq' 'coqide' 'coq-doc')
-pkgver=8.11.2
+pkgver=8.12.0
 pkgrel=1
 pkgdesc='Formal proof management system'
 arch=('x86_64')
@@ -22,9 +22,8 @@
              '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" "0002-Sphinx-3-support.patch")
-sha512sums=('f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c'
-            '1bcbe09593f90c89f27db97a910b934cdb3af566ca14db887f2f720faedc35922e4048ba833abbb96128cfc1c8dc023843f528c53f488fc8bc68eaeb83fd7658')
+source=("coq-${pkgver}.tar.gz::https://github.com/coq/coq/archive/V${pkgver}.tar.gz")
+sha512sums=('8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240')
 
 prepare() {
   gendesk -f -n --pkgname "coqide" \
@@ -31,8 +30,6 @@
     --name "CoqIDE Proof Assistant" \
     --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() {