[arch-commits] Commit in coq/repos/community-x86_64 (3 files)
Baptiste Jonglez
zorun at archlinux.org
Sat Jul 25 10:51:36 UTC 2020
Date: Saturday, July 25, 2020 @ 10:51:35
Author: zorun
Revision: 665261
archrelease: copy trunk to community-x86_64
Added:
coq/repos/community-x86_64/PKGBUILD
(from rev 665260, coq/trunk/PKGBUILD)
Deleted:
coq/repos/community-x86_64/0002-Sphinx-3-support.patch
coq/repos/community-x86_64/PKGBUILD
-----------------------------+
0002-Sphinx-3-support.patch | 46 ---------
PKGBUILD | 195 ++++++++++++++++++++----------------------
2 files changed, 96 insertions(+), 145 deletions(-)
Deleted: 0002-Sphinx-3-support.patch
===================================================================
--- 0002-Sphinx-3-support.patch 2020-07-25 10:51:25 UTC (rev 665260)
+++ 0002-Sphinx-3-support.patch 2020-07-25 10:51:35 UTC (rev 665261)
@@ -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')
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-25 10:51:25 UTC (rev 665260)
+++ PKGBUILD 2020-07-25 10:51:35 UTC (rev 665261)
@@ -1,99 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: acieroid
-# Contributor: spider-mario <spidermario at free.fr>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: George Giorgidze <giorgidze at gmail.com>
-# Contributor: William J. Bowman <bluephoenix47 at gmail.com>
-
-pkgname=('coq' 'coqide' 'coq-doc')
-pkgver=8.11.2
-pkgrel=1
-pkgdesc='Formal proof management system'
-arch=('x86_64')
-url='https://coq.inria.fr/'
-license=('GPL')
-groups=('coq')
-options=('!emptydirs')
-depends=('ocaml' 'ocaml-num' 'gtk3' 'gtksourceview3')
-makedepends=('ocaml-findlib'
- 'lablgtk3' 'gendesk' # coqide
- 'texlive-bin' 'texlive-latexextra' 'texlive-pictures' # coq-doc
- 'texlive-fontsextra' 'texlive-science'
- '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')
-
-prepare() {
- gendesk -f -n --pkgname "coqide" \
- --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() {
- cd "$srcdir/coq-$pkgver"
-
- ./configure \
- -prefix '/usr' \
- -mandir '/usr/share/man' \
- -configdir '/etc/xdg/coq/' \
- -coqide opt \
- -with-doc yes
- # https://github.com/coq/coq/issues/12332
- SPHINXWARNERROR=0 make world
-}
-
-package_coq() {
- depends=('ocaml')
- optdepends=('coqide: graphical Coq IDE'
- 'coq-doc: offline documentation'
- 'coin-or-csdp: for psatz plugin')
- # coq-nox was the old name for coq without coqide
- replaces=('coq-nox')
- conflicts=('coq-nox')
-
- cd "$srcdir/coq-$pkgver"
-
- # The second target is needed to install coqidetop.cmxs (needed for some
- # frontend other than coqide, for instance coquille)
- make COQINSTALLPREFIX="$pkgdir" install-coq install-ide-toploop install-meta
- rm -f "${pkgdir}/usr/share/man/man1/coqide.1"
- # Workaround for FS#58203
- mkdir -p "$pkgdir/usr/lib/ocaml/"
- ln -s /usr/lib/coq "$pkgdir/usr/lib/ocaml/coq"
-}
-
-package_coqide() {
- pkgdesc="GTK-based graphical interface for the Coq proof assistant"
- depends=('coq' 'ocaml' 'gtk3' 'gtksourceview3')
-
- cd "$srcdir/coq-$pkgver"
-
- mkdir -p "${pkgdir}/usr/bin"
- make COQINSTALLPREFIX="$pkgdir" install-coqide
- install -D -m 644 -t "${pkgdir}/usr/share/man/man1/" man/coqide.1
-
- # Remove toploop files installed by "install-ide-toploop" in the main package
- rm -f "${pkgdir}/usr/lib/coq/toploop"/coqidetop.{cma,cmxs}
- rm -f "${pkgdir}/usr/bin"/coqidetop{,.opt}
- # In coq 8.7 this file is installed both by install-coq and install-coqide, remove the duplicate.
- rm -f "${pkgdir}/usr/lib/coq/vernac/topfmt.cmi"
-
- # Desktop file generated by gendesk
- install -D -m 644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -D -m 644 ide/coq.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
-
-package_coq-doc() {
- pkgdesc="HTML and PDF documentation for the Coq proof assistant"
- depends=()
-
- cd "$srcdir/coq-$pkgver"
-
- make COQINSTALLPREFIX="$pkgdir" install-doc
-}
Copied: coq/repos/community-x86_64/PKGBUILD (from rev 665260, coq/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-25 10:51:35 UTC (rev 665261)
@@ -0,0 +1,96 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: acieroid
+# Contributor: spider-mario <spidermario at free.fr>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: George Giorgidze <giorgidze at gmail.com>
+# Contributor: William J. Bowman <bluephoenix47 at gmail.com>
+
+pkgname=('coq' 'coqide' 'coq-doc')
+pkgver=8.12.0
+pkgrel=1
+pkgdesc='Formal proof management system'
+arch=('x86_64')
+url='https://coq.inria.fr/'
+license=('GPL')
+groups=('coq')
+options=('!emptydirs')
+depends=('ocaml' 'ocaml-num' 'gtk3' 'gtksourceview3')
+makedepends=('ocaml-findlib'
+ 'lablgtk3' 'gendesk' # coqide
+ 'texlive-bin' 'texlive-latexextra' 'texlive-pictures' # coq-doc
+ 'texlive-fontsextra' 'texlive-science'
+ '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=('8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240')
+
+prepare() {
+ gendesk -f -n --pkgname "coqide" \
+ --name "CoqIDE Proof Assistant" \
+ --pkgdesc "Graphical interface for the Coq proof assistant" \
+ --categories "Development;Science;Math;IDE;GTK"
+}
+
+build() {
+ cd "$srcdir/coq-$pkgver"
+
+ ./configure \
+ -prefix '/usr' \
+ -mandir '/usr/share/man' \
+ -configdir '/etc/xdg/coq/' \
+ -coqide opt \
+ -with-doc yes
+ # https://github.com/coq/coq/issues/12332
+ SPHINXWARNERROR=0 make world
+}
+
+package_coq() {
+ depends=('ocaml')
+ optdepends=('coqide: graphical Coq IDE'
+ 'coq-doc: offline documentation'
+ 'coin-or-csdp: for psatz plugin')
+ # coq-nox was the old name for coq without coqide
+ replaces=('coq-nox')
+ conflicts=('coq-nox')
+
+ cd "$srcdir/coq-$pkgver"
+
+ # The second target is needed to install coqidetop.cmxs (needed for some
+ # frontend other than coqide, for instance coquille)
+ make COQINSTALLPREFIX="$pkgdir" install-coq install-ide-toploop install-meta
+ rm -f "${pkgdir}/usr/share/man/man1/coqide.1"
+ # Workaround for FS#58203
+ mkdir -p "$pkgdir/usr/lib/ocaml/"
+ ln -s /usr/lib/coq "$pkgdir/usr/lib/ocaml/coq"
+}
+
+package_coqide() {
+ pkgdesc="GTK-based graphical interface for the Coq proof assistant"
+ depends=('coq' 'ocaml' 'gtk3' 'gtksourceview3')
+
+ cd "$srcdir/coq-$pkgver"
+
+ mkdir -p "${pkgdir}/usr/bin"
+ make COQINSTALLPREFIX="$pkgdir" install-coqide
+ install -D -m 644 -t "${pkgdir}/usr/share/man/man1/" man/coqide.1
+
+ # Remove toploop files installed by "install-ide-toploop" in the main package
+ rm -f "${pkgdir}/usr/lib/coq/toploop"/coqidetop.{cma,cmxs}
+ rm -f "${pkgdir}/usr/bin"/coqidetop{,.opt}
+ # In coq 8.7 this file is installed both by install-coq and install-coqide, remove the duplicate.
+ rm -f "${pkgdir}/usr/lib/coq/vernac/topfmt.cmi"
+
+ # Desktop file generated by gendesk
+ install -D -m 644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -D -m 644 ide/coq.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
+
+package_coq-doc() {
+ pkgdesc="HTML and PDF documentation for the Coq proof assistant"
+ depends=()
+
+ cd "$srcdir/coq-$pkgver"
+
+ make COQINSTALLPREFIX="$pkgdir" install-doc
+}
More information about the arch-commits
mailing list