Date: Friday, November 1, 2019 @ 17:40:15 Author: zorun Revision: 522065
upgpkg: coq 8.10.1-1 Modified: coq/trunk/PKGBUILD Deleted: coq/trunk/ocaml408_compat.patch -----------------------+ PKGBUILD | 19 ++++++++----------- ocaml408_compat.patch | 13 ------------- 2 files changed, 8 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-01 17:37:52 UTC (rev 522064) +++ PKGBUILD 2019-11-01 17:40:15 UTC (rev 522065) @@ -6,8 +6,8 @@ # Contributor: William J. Bowman <[email protected]> pkgname=('coq' 'coqide' 'coq-doc') -pkgver=8.9.1 -pkgrel=4 +pkgver=8.10.1 +pkgrel=1 pkgdesc='Formal proof management system' arch=('x86_64') url='https://coq.inria.fr/' @@ -14,18 +14,16 @@ license=('GPL') groups=('coq') options=('!emptydirs') -depends=('ocaml' 'camlp5' 'ocaml-num' 'gtk2' 'gtksourceview2') +depends=('ocaml' 'ocaml-num' 'gtk3' 'gtksourceview3') makedepends=('ocaml-findlib' - 'lablgtk2' 'gendesk' # coqide + '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"; -"ocaml408_compat.patch") -sha512sums=('66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983' -'df50beaf50e8ed6c208682327634ba0c656d041598d9a81d762ba07bba01336b769defc9deabe0e37c66deca3bce8c418c16da26c084564c2147e55b646508f5') +source=("coq-${pkgver}.tar.gz::https://github.com/coq/coq/archive/V${pkgver}.tar.gz";) +sha512sums=('5c6a20e283c351a4b0ecdb393fb77cfc9b72b474453c99c95f52a70da47dd72fff7229c2ef92d61aadade8f2ed6e03c1a7740d0fa2fcc87ea72659f95eceb2dc') prepare() { gendesk -f -n --pkgname "coqide" \ @@ -33,7 +31,6 @@ --pkgdesc "Graphical interface for the Coq proof assistant" \ --categories "Development;Science;Math;IDE;GTK" cd "$srcdir/coq-$pkgver" - patch -p1 -i "${srcdir}/ocaml408_compat.patch" } build() { @@ -50,7 +47,7 @@ } package_coq() { - depends=('ocaml' 'camlp5') + depends=('ocaml') optdepends=('coqide: graphical Coq IDE' 'coq-doc: offline documentation' 'coin-or-csdp: for psatz plugin') @@ -71,7 +68,7 @@ package_coqide() { pkgdesc="GTK-based graphical interface for the Coq proof assistant" - depends=('coq' 'ocaml' 'camlp5' 'gtk2' 'gtksourceview2') + depends=('coq' 'ocaml' 'gtk3' 'gtksourceview3') cd "$srcdir/coq-$pkgver" Deleted: ocaml408_compat.patch =================================================================== --- ocaml408_compat.patch 2019-11-01 17:37:52 UTC (rev 522064) +++ ocaml408_compat.patch 2019-11-01 17:40:15 UTC (rev 522065) @@ -1,13 +0,0 @@ -diff --git a/Makefile.build b/Makefile.build -index ed29e21c82..02a92cd404 100644 ---- a/Makefile.build -+++ b/Makefile.build -@@ -262,7 +262,7 @@ endef - CAMLP5DEPS:=grammar/grammar.cma - CAMLP5USE=pa_extend.cmo q_MLast.cmo pa_macro.cmo -D$(CAMLVERSION) - --PR_O := $(if $(READABLE_ML4),pr_o.cmo,pr_dump.cmo) -+PR_O := $(if $(READABLE_ML4),pr_o.cmo,) - - # Main packages linked by Coq. - SYSMOD:=-package num,str,unix,dynlink,threads
