Received: from mx12.valuehost.ru (mx12.valuehost.ru [217.112.42.215]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTP id B99DF7819AA for ; Thu, 7 Nov 2019 12:23:28 +0000 (UTC) Received: from mx7.valuehost.ru (unknown [127.0.0.255]) by mx12.valuehost.ru (Postfix) with ESMTP id 4DAA84CA5B for ; Thu, 7 Nov 2019 15:23:28 +0300 (MSK) From: alpine-mips-patches Date: Thu, 7 Nov 2019 12:11:30 +0000 Subject: [PATCH 5 of 6] testing/coq: upgrade to 8.9.1 To: alpine-aports@lists.alpinelinux.org Message-Id: <20191107122328.4DAA84CA5B@mx12.valuehost.ru> --- testing/coq/APKBUILD | 21 +++++++-------------- testing/coq/skip-redundant-pr_dump.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 testing/coq/skip-redundant-pr_dump.patch diff --git a/testing/coq/APKBUILD b/testing/coq/APKBUILD index 26f689f9df..0758ffc64a 100644 --- a/testing/coq/APKBUILD +++ b/testing/coq/APKBUILD @@ -1,7 +1,7 @@ # Contributor: alpine-mips-patches # Maintainer: alpine-mips-patches pkgname=coq -pkgver=8.8.2 +pkgver=8.9.1 pkgrel=0 pkgdesc="A formal proof management system" url="https://coq.inria.fr" @@ -10,12 +10,13 @@ license="LGPL-2.1" depends="ocaml-runtime" makedepends="ocaml ocaml-compiler-libs ocaml-findlib ocaml-camlp5-dev ocaml-num-dev" options="!check" -subpackages="$pkgname-doc $pkgname-emacs:emacs:noarch" -source="$pkgname-$pkgver.tar.gz::https://github.com/coq/$pkgname/archive/V$pkgver.tar.gz" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/coq/$pkgname/archive/V$pkgver.tar.gz + skip-redundant-pr_dump.patch + " builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" ./configure \ -prefix /usr \ -coqdocdir /usr/share/texmf-dist/tex/latex/misc \ @@ -26,16 +27,8 @@ build() { } package() { - cd "$builddir" make OLDROOT= COQINSTALLPREFIX="$pkgdir" install } -emacs() { - depends="$pkgname=$pkgver-r$pkgrel emacs" - pkgdesc="$pkgdesc (Emacs files)" - - mkdir -p "$subpkgdir/usr/share" - mv "$pkgdir/usr/share/emacs" "$subpkgdir/usr/share" -} - -sha512sums="b0f0480fe052fced6016014cf1872d4e004b0dacb779927376d797c279aca9d5f6f4ed3d0f5ee5d42748bbd5c29b43f7a69748564a12a116bcc7ba3b052d8954 coq-8.8.2.tar.gz" +sha512sums="66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983 coq-8.9.1.tar.gz +c03d9f717f6b3730192a086020b0457c4b2dd39d28080cd526f2a14da473194f14ead798f12e792a0bef26ac791012833b4aba8b12e7606b8602ba3224e473bb skip-redundant-pr_dump.patch" diff --git a/testing/coq/skip-redundant-pr_dump.patch b/testing/coq/skip-redundant-pr_dump.patch new file mode 100644 index 0000000000..dd69e37398 --- /dev/null +++ b/testing/coq/skip-redundant-pr_dump.patch @@ -0,0 +1,12 @@ +diff -urN a/Makefile.build b/Makefile.build +--- a/Makefile.build 2019-05-17 12:19:23.000000000 +0000 ++++ b/Makefile.build 2019-09-01 07:56:47.597165026 +0000 +@@ -262,7 +262,7 @@ + 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 -- 2.23.0