[arch-commits] Commit in coq/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Monday, January 18, 2021 @ 12:08:12
  Author: kgizdov
Revision: 822828

upgpkg: coq 8.13.0-1

Modified:
  coq/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-18 11:56:38 UTC (rev 822827)
+++ PKGBUILD	2021-01-18 12:08:12 UTC (rev 822828)
@@ -5,9 +5,10 @@
 # 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=2
+pkgbase=coq
+pkgname=("${pkgbase}" "${pkgbase}ide" "${pkgbase}-doc")
+pkgver=8.13.0
+pkgrel=1
 pkgdesc='Formal proof management system'
 arch=('x86_64')
 url='https://coq.inria.fr/'
@@ -14,7 +15,7 @@
 license=('GPL')
 groups=('coq')
 options=('!emptydirs')
-depends=('ocaml>=4.11.0' 'ocaml-num' 'gtk3' 'gtksourceview3')
+depends=('ocaml>=4.11.0' 'ocaml-num' 'ocaml-zarith' 'gtk3' 'gtksourceview3')
 makedepends=('ocaml-findlib'
              'lablgtk3' 'gendesk' # coqide
              'texlive-bin' 'texlive-latexextra' 'texlive-pictures' # coq-doc
@@ -23,17 +24,18 @@
              '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')
+sha512sums=('c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e')
 
-prepare() {
-  gendesk -f -n --pkgname "coqide" \
+build() {
+  # generate a desktop file
+  cd "${srcdir}"
+  gendesk -f -n --pkgname "${pkgbase}ide" \
     --name "CoqIDE Proof Assistant" \
     --pkgdesc "Graphical interface for the Coq proof assistant" \
     --categories "Development;Science;Math;IDE;GTK"
-}
 
-build() {
-  cd "$srcdir/coq-$pkgver"
+  # build package
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure \
     -prefix '/usr' \
@@ -54,25 +56,28 @@
   replaces=('coq-nox')
   conflicts=('coq-nox')
 
-  cd "$srcdir/coq-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
+  # fix intermittent bug with folder creation
+  install -d "${pkgdir}/usr/bin"
+
   # 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
+  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"
+  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')
+  depends=("${pkgbase}" 'ocaml' 'gtk3' 'gtksourceview3')
 
-  cd "$srcdir/coq-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   mkdir -p "${pkgdir}/usr/bin"
-  make COQINSTALLPREFIX="$pkgdir" install-coqide
+  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
@@ -83,7 +88,7 @@
 
   # 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"
+  install -D -m 644 ide/coqide/coq.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
 
 package_coq-doc() {
@@ -90,7 +95,7 @@
   pkgdesc="HTML and PDF documentation for the Coq proof assistant"
   depends=()
 
-  cd "$srcdir/coq-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  make COQINSTALLPREFIX="$pkgdir" install-doc
+  make COQINSTALLPREFIX="${pkgdir}" install-doc
 }