Re: [PR PATCH] [Updated] OCaml 4.12

[leahneukirchen <leahneukirchen@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages ocaml412
https://github.com/void-linux/void-packages/pull/29279

OCaml 4.12
First stab at it.

Currently broken:

- [ ] xen
- [ ] libguestfs
- [ ] unison
- [ ] polygen
- [ ] coccinelle

A patch file from https://github.com/void-linux/void-packages/pull/29279.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml412-29279.patch --]
[-- Type: text/x-diff, Size: 10542 bytes --]

From 18f3a10162effd4208058e72aee7e0e9d21bdbc0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:00:06 +0100
Subject: [PATCH 01/14] ocaml: update to 4.12.0.

---
 srcpkgs/ocaml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index c941d4b3368..70cb82442f2 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.11.1
+version=4.12.0
 revision=1
 build_style="gnu-configure"
 configure_args="--with-pic --disable-force-safe-string"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=cd3cd55d465028b161c8c33bafc14ee6ae1d91b5efe51098350f8e8a5f454baf
+checksum=adc07a3995362403f3cb11085a86354de08e5a7f9eb3c09be7bbcc38a3a26744
 nocross=yes
 patch_args="-Np1"
 

From 2f0da67f2b935bc01c7b7c45987d86c3fbfc8db1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:02:00 +0100
Subject: [PATCH 02/14] ocaml-findlib: rebuild for ocaml-4.12.0.

---
 srcpkgs/ocaml-findlib/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 93ec4b9e6bc..68fa404fc51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
 version=1.8.1
-revision=4
+revision=5
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
@@ -21,6 +21,4 @@ do_install() {
 	make prefix="$DESTDIR" install
 	vbin src/findlib/ocamlfind_opt
 	vlicense LICENSE
-
-	rm ${DESTDIR}/usr/lib/ocaml/ocamlbuild/META
 }

From 95c19990494af2cb6a40a15204ecbea393aeb244 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:00:29 +0100
Subject: [PATCH 03/14] ocaml-num: rebuild for ocaml-4.12.0.

---
 srcpkgs/ocaml-num/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index 736c1361b3d..faa7b02c15c 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.4
-revision=1
+revision=2
 wrksrc="num-${version}"
 build_style=gnu-makefile
 make_install_target="findlib-install"

From 32f00ed9b32d0f27a36d5744d85c57a8a4ba0f44 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:06:01 +0100
Subject: [PATCH 04/14] ocaml-zarith: update to 1.12.

---
 srcpkgs/ocaml-zarith/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 642476093c2..4c14a4143b1 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
-version=1.11
-revision=2
+version=1.12
+revision=1
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-only,OCaml-LGPL-linking-exception"
 homepage="https://github.com/ocaml/zarith"
 distfiles="https://github.com/ocaml/zarith/archive/release-${version}.tar.gz"
-checksum=f996af120a10fd06a8272ae99b7affd57cef49c57a3a596e2f589147dd183684
+checksum=cc32563c3845c86d0f609c86d83bf8607ef12354863d31d3bffc0dacf1ed2881
 nocross=yes
 disable_parallel_build=yes
 

From 0edf3a71c7c73b33f890aba73371e705e1e08c28 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:06:17 +0100
Subject: [PATCH 05/14] ocamlbuild: rebuild for ocaml-4.12.0.

---
 srcpkgs/ocamlbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index c0caeba4be2..9be2cd0dbda 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"

From 5fe8a6d22df2809df3960a2518fcdd59bb126545 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:06:30 +0100
Subject: [PATCH 06/14] camlp5: rebuild for ocaml-4.12.0.

---
 srcpkgs/camlp5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 3b6b18ce5e8..696d3a4093e 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=7.14
-revision=1
+revision=2
 wrksrc="camlp5-rel${version//./}"
 build_style=configure
 configure_args="-mandir /usr/share/man"

From 79a03faf2a35dd3a29f3ef73c9928b0500f854ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:11:30 +0100
Subject: [PATCH 07/14] hivex: rebuild for ocaml-4.12.0.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 6ea87921c50..fee00bd4ae9 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.19
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 73393fc7bc9b3aaecc4b860c5c106a58e0ef22d8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:30:05 +0100
Subject: [PATCH 08/14] opam: rebuild for ocaml-4.12.0.

---
 srcpkgs/opam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index ec430863b4d..c06f3dda355 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.0.8
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"

From e72dbb85ae0c78aef0c3e05994f15ff375f4b7d4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:59:07 +0100
Subject: [PATCH 09/14] ocaml-lablgtk2: rebuild for ocaml-4.12.0.

---
 srcpkgs/ocaml-lablgtk2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index e1ef60da18c..952b4b9c3dc 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.10
-revision=2
+revision=3
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"

From 5f4c1c0ba51a9b24b2e59e2bdb3410942ad8c11e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:59:49 +0100
Subject: [PATCH 10/14] pdfsandwich: rebuild for ocaml-4.12.0.

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index 67c1a011ba7..07052abf413 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfsandwich'
 pkgname=pdfsandwich
 version=0.1.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"

From bbabd6337c05fd61277e0ae38a0d2013813ede54 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 17:00:13 +0100
Subject: [PATCH 11/14] supermin: rebuild for ocaml-4.12.0.

---
 srcpkgs/supermin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index ff5304205bc..c088cb9a438 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.2.1
-revision=1
+revision=2
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"

From 860ab89905c57058c9743643c375bbfbbb3ef759 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 17:03:59 +0100
Subject: [PATCH 12/14] z3: rebuild for ocaml-4.12.0.

---
 srcpkgs/z3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 8a58beb6fba..125f2d856ee 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.10
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From 4bf97f0dce673fb8e6192e5d50c5131b4717864d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 17:06:36 +0100
Subject: [PATCH 13/14] zeroinstall: rebuild for ocaml-4.12.0.

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 514e22f7655..fe2835b1a9e 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
 # Template file for 'zeroinstall'
 pkgname=zeroinstall
 version=2.17
-revision=3
+revision=4
 wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"

From 3dc098a1c26d16b8af6354cb4b88276de3819070 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 21:15:12 +0100
Subject: [PATCH 14/14] coq: rebuild for ocaml-4.12.0.

---
 srcpkgs/coq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 2f8f04c5e5e..377bbb95af7 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.13.1
-revision=1
+revision=2
 hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"