[PR PATCH] Ocaml 4.09.0

[voidlinux-github@inbox.vuxu.org]

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

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages ocaml409
https://github.com/void-linux/void-packages/pull/14850

Ocaml 4.09.0
Fairly straightforward.

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

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

From 750bc991a8e2f40671ac8890d22bf69149ca4dbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:22:06 +0200
Subject: [PATCH 01/14] ocaml: update to 4.09.0.

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

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 7ac1c214310..c246404a01a 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.08.1
+version=4.09.0
 revision=1
 build_style="gnu-configure"
 configure_args="--with-pic"
@@ -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=b53ed3d487b83fd49bc181bded066ae8e6fb592cf40514261d27d36050d5db85
+checksum=a7bc044167e7d09f8e3ea84b88ec9d81392908ecdac861d3d5015e5f0fc496a3
 nocross=yes
 patch_args="-Np1"
 

From 9f96fc0caf34b9d89583a6196077d7edd3dfd031 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:22:12 +0200
Subject: [PATCH 02/14] ocamlbuild: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index bb7d2201edd..b5db3a6d844 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"

From 0532904ebe5fc8e4b81b253f4dbc5781751a96cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:23:26 +0200
Subject: [PATCH 03/14] ocaml-num: rebuild for ocaml-4.09.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 bf5af4e7a68..c8aa7bbbb9e 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.2
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="ocaml ocaml-findlib"
 make_install_target="findlib-install"

From 5e8d74097a99a3978b003cfa29db93e69496a65a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:25:35 +0200
Subject: [PATCH 04/14] ocaml-findlib: update to 1.8.1.

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

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 519aa89bbab..5d9565fddc4 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.7.3
-revision=5
+version=1.8.1
+revision=1
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
@@ -10,8 +10,8 @@ short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
-distfiles="http://download2.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b
+distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
+checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
 wrksrc="findlib-${version}"
 nocross=yes
 nopie=yes

From 4a649ba727454235550945e4f6dea78957466c05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:25:54 +0200
Subject: [PATCH 05/14] polygen: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index 7c5df93839c..0781c4b78ec 100644
--- a/srcpkgs/polygen/template
+++ b/srcpkgs/polygen/template
@@ -1,7 +1,7 @@
 # Template file for 'polygen'
 pkgname=polygen
 version=1.0.6.ds2
-revision=4
+revision=5
 build_style=gnu-makefile
 build_wrksrc="src"
 hostmakedepends="ocaml unzip"

From 33baf6465cb228de9714877429e6acd9937700c8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:26:14 +0200
Subject: [PATCH 06/14] supermin: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 07fe80f46b3..126ee0d8ccd 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.1.20
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
 makedepends="e2fsprogs-devel"

From a94d21d4c8ed4aefe53c9600cccae629ab2240b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:26:40 +0200
Subject: [PATCH 07/14] z3: rebuild for ocaml-4.09.0.

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

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

From 0b656a866b834cdf9d727c05c1cf115f9a6eae8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:26:53 +0200
Subject: [PATCH 08/14] opam: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index efb8f38140b..110a00f4b73 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 disable_parallel_build=yes
 configure_args="--docdir=/usr/share/doc/${pkgname}"

From 331e38c0252aa8ad5d529bc1a251443d5d6e637f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:27:22 +0200
Subject: [PATCH 09/14] camlp5: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 54b1e48f8ee..09e214a685c 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=7.10
-revision=1
+revision=2
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml"

From 8c8336fb0f9404f3ce45a69df58877d276424a59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:27:55 +0200
Subject: [PATCH 10/14] camlp4: rebuild for ocaml-4.09.0.

---
 srcpkgs/camlp4/patches/version-hack.patch | 11 +++++++++++
 srcpkgs/camlp4/template                   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/camlp4/patches/version-hack.patch

diff --git a/srcpkgs/camlp4/patches/version-hack.patch b/srcpkgs/camlp4/patches/version-hack.patch
new file mode 100644
index 00000000000..34f7f48ff8c
--- /dev/null
+++ b/srcpkgs/camlp4/patches/version-hack.patch
@@ -0,0 +1,11 @@
+--- configure.orig
++++ configure
+@@ -39,7 +39,7 @@
+     echo "The standalone Camlp4 requires OCaml >= 4.02."
+     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
+     exit 2
+-elif [ $major -ne 4 -o $minor -ne 8 ]; then
++elif [ $major -ne 4 -o $minor -ne 9 ]; then
+     echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version."
+     if [ -d .git ] ; then
+       if [ $PINNED -eq 1 ] ; then
diff --git a/srcpkgs/camlp4/template b/srcpkgs/camlp4/template
index 6d84e7e5093..64c324cb1a5 100644
--- a/srcpkgs/camlp4/template
+++ b/srcpkgs/camlp4/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp4'
 pkgname=camlp4
 version=4.08+1
-revision=1
+revision=2
 wrksrc="camlp4-${version/+/-}"
 build_style=configure
 hostmakedepends="ocaml ocamlbuild"

From 3ca82f304ff409df6a497cdc8798faa7cd48aaa6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:32:41 +0200
Subject: [PATCH 11/14] unison: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index abdf9a02831..0f561b50bc5 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname="unison"
 version=2.51.2
-revision=3
+revision=4
 hostmakedepends="ocaml"
 short_desc="A file-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"

From fbb42699bac1a26b4e86e228867efbaa77bba8f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:33:45 +0200
Subject: [PATCH 12/14] coq: rebuild for ocaml-4.09.0.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index d69848b9254..2b35f0c6575 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
 pkgname=coq
 version=8.9.1
-revision=2
+revision=3
 hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d9ecdccd0e8cfbc0aa8c5a9a28fae2de01632ccd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 16:47:34 +0200
Subject: [PATCH 13/14] mathcomp: rebuild for coq-8.9.1_3.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 417e7334191..d9f2f0c3bf8 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.9.0
-revision=2
+revision=3
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 7f20377579050d5b2aa8452813b3fdc9462dafef Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Sep 2019 17:00:31 +0200
Subject: [PATCH 14/14] ocaml-lablgtk2: rebuild for ocaml-4.09.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 bd235dd0823..2bede4f1ce6 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.8
-revision=1
+revision=2
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"