Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] OCaml 4.12
@ 2021-03-06 20:18 leahneukirchen
  2021-03-06 20:19 ` [PR PATCH] [Updated] " leahneukirchen
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: leahneukirchen @ 2021-03-06 20:18 UTC (permalink / raw)
  To: ml

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

There is a new 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: 16817 bytes --]

From 0f63401d2dc7cf14c1ff94798e5b3893cd024d7e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:19:25 +0100
Subject: [PATCH 01/20] dovecot: update to 2.3.14.

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

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 84819fd693b..db1bde7f188 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.13
-revision=3
+version=2.3.14
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
+checksum=c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 3a363adfc3e3bba5e9cd8a893c56c8102b3841f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:19:30 +0100
Subject: [PATCH 02/20] dovecot-plugin-pigeonhole: update to 0.5.14.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 7b40b63aaac..c0ed31b43fa 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.13
-revision=2
+version=0.5.14
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -19,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
+checksum=68ca0f78a3caa6b090a469f45c395c44cf16da8fcb3345755b1ca436c9ffb2d2
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 75a577798d928381ed7f52094637472e28858250 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:31:04 +0100
Subject: [PATCH 03/20] perl-PDF-API2: update to 2.039.

---
 srcpkgs/perl-PDF-API2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 1e5ef0520fe..e3be0d9f166 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.038
-revision=2
+version=2.039
+revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=7447c4749b02a784f525d3c7ece99d34b0a10475db65096f6316748dd2f9bd09
+checksum=36a74318847fe92ecec45221bc78f209e194f9f979521710a89ef7baa955a123

From b837680bccf4bc989692796fd62a9332fcb4c59a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:31:30 +0100
Subject: [PATCH 04/20] progress: update to 0.16.

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

diff --git a/srcpkgs/progress/template b/srcpkgs/progress/template
index e9988680797..c71302e545a 100644
--- a/srcpkgs/progress/template
+++ b/srcpkgs/progress/template
@@ -1,6 +1,6 @@
 # Template file for 'progress'
 pkgname=progress
-version=0.15
+version=0.16
 revision=1
 makedepends="ncurses-devel"
 short_desc="Tool for showing the progress of cp, rm, dd and more"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Xfennec/progress"
 distfiles="https://github.com/Xfennec/progress/archive/v${version}.tar.gz"
-checksum=1ed0ac65a912ef1aa605d524eaddaacae92079cf71182096a7c65cbc61687d1b
+checksum=59944ee35f8ae6d62ed4f9b643eee2ae6d03825da288d9779dc43de41164c834
 
 do_build() {
 	${CC} ${CFLAGS} -D_FILE_OFFSET_BITS=64 \

From 8f71bbb9fad6241bab7edec7ba2ee783493b1eeb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 15:55:44 +0100
Subject: [PATCH 05/20] autocutsel: update to 0.10.1.

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

diff --git a/srcpkgs/autocutsel/template b/srcpkgs/autocutsel/template
index 59648a29e0a..e537939d0cd 100644
--- a/srcpkgs/autocutsel/template
+++ b/srcpkgs/autocutsel/template
@@ -1,7 +1,7 @@
 # Template file for 'autocutsel'
 pkgname=autocutsel
-version=0.10.0
-revision=6
+version=0.10.1
+revision=1
 build_style=gnu-configure
 makedepends="libXaw-devel"
 short_desc="Synchronize the two copy/paste buffers used by X applications"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/sigmike/autocutsel"
 distfiles="https://github.com/sigmike/autocutsel/releases/download/$version/autocutsel-$version.tar.gz"
-checksum=a2376330aa1a65f36621595a5a4eb5c2cabc16854b69d66c285f11f89bd05e3f
+checksum=f17e06d42f7494436d4b26f4be0b6b0da39481c0400c96778e4b905b6341eb17

From cf9af725e4d789693483184ac3f50a208e4aa704 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 15:56:58 +0100
Subject: [PATCH 06/20] rex: update to 1.13.3.

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

diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template
index 6160f04baa2..712f1aa1cf9 100644
--- a/srcpkgs/rex/template
+++ b/srcpkgs/rex/template
@@ -1,6 +1,6 @@
 # Template file for 'rex'
 pkgname=rex
-version=1.13.2
+version=1.13.3
 revision=1
 wrksrc="Rex-${version}"
 build_style=perl-module

From 2f68b67ace5cbfc5507e7193fbdf08d575fa461c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:00:06 +0100
Subject: [PATCH 07/20] 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 ca4c0de5395dab2c5db62006e82bfbf43d47aa98 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:02:00 +0100
Subject: [PATCH 08/20] 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 2625268fd3bf55fbba6a1c54e076e367d29cddec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:00:29 +0100
Subject: [PATCH 09/20] 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 bf369bd49e59bc601ed9c2592e7de11bad4949e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:06:01 +0100
Subject: [PATCH 10/20] 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 815e9143bb75ea2fb1b0bb202aaad7f27883f089 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:06:17 +0100
Subject: [PATCH 11/20] 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 6386838a743a7b615c09f0d5bd97856a34c386ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:06:30 +0100
Subject: [PATCH 12/20] 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 c5f618066d0ceae61f62ce07fdbf98013bd737ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:11:30 +0100
Subject: [PATCH 13/20] 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 df28bf6b42b2ecf8b6a29bebd9e714996e460823 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:30:05 +0100
Subject: [PATCH 14/20] 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 70fbc12537f2c15a38e86eef19d9a735715027a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:59:07 +0100
Subject: [PATCH 15/20] 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 a8d5976068b977d10ec674ca6c9f3e266aa00461 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 16:59:49 +0100
Subject: [PATCH 16/20] 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 2f65ac8ab287715d470c79a34c11b2b1c36ed22b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 17:00:13 +0100
Subject: [PATCH 17/20] 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 0d29ebd8014c7ae4762ddf6e6af38b0ec83d4d0f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 17:03:59 +0100
Subject: [PATCH 18/20] 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 a0bd43477105eda0f5eb118e8002132d209ab5bd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 17:06:36 +0100
Subject: [PATCH 19/20] 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 76e7f56fc614f2a3a32a0c78fd02eb61dc80acc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 21:15:12 +0100
Subject: [PATCH 20/20] 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>"

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
@ 2021-03-06 20:19 ` leahneukirchen
  2021-05-23 16:03 ` [PR REVIEW] " kit-ty-kate
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-03-06 20:19 UTC (permalink / raw)
  To: ml

[-- 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>"

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
  2021-03-06 20:19 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-05-23 16:03 ` kit-ty-kate
  2021-05-23 16:08 ` kit-ty-kate
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: kit-ty-kate @ 2021-05-23 16:03 UTC (permalink / raw)
  To: ml

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

New review comment by kit-ty-kate on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#discussion_r637567335

Comment:
1.9.1 has been released (when used the build dep on `m4` can be removed)

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
  2021-03-06 20:19 ` [PR PATCH] [Updated] " leahneukirchen
  2021-05-23 16:03 ` [PR REVIEW] " kit-ty-kate
@ 2021-05-23 16:08 ` kit-ty-kate
  2021-05-23 16:11 ` kit-ty-kate
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: kit-ty-kate @ 2021-05-23 16:08 UTC (permalink / raw)
  To: ml

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

New comment by kit-ty-kate on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-846586913

Comment:
coccinelle.1.1.0 is compatible: https://github.com/ocaml/opam-repository/pull/18249

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (2 preceding siblings ...)
  2021-05-23 16:08 ` kit-ty-kate
@ 2021-05-23 16:11 ` kit-ty-kate
  2021-05-23 16:12 ` kit-ty-kate
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: kit-ty-kate @ 2021-05-23 16:11 UTC (permalink / raw)
  To: ml

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

New comment by kit-ty-kate on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-846587297

Comment:
`polygen` is being fixed here: https://github.com/alvisespano/Polygen/pull/22

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (3 preceding siblings ...)
  2021-05-23 16:11 ` kit-ty-kate
@ 2021-05-23 16:12 ` kit-ty-kate
  2021-05-23 16:20 ` kit-ty-kate
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: kit-ty-kate @ 2021-05-23 16:12 UTC (permalink / raw)
  To: ml

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

New comment by kit-ty-kate on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-846587426

Comment:
> Unison has been patched: [bcpierce00/unison@2e12fc4](https://github.com/bcpierce00/unison/commit/2e12fc4f41b39ca9a5e501d7df5c2c33a75d3b95)

Said patch is included in [2.51.4~rc2](https://github.com/bcpierce00/unison/releases/tag/v2.51.4_rc2)

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (4 preceding siblings ...)
  2021-05-23 16:12 ` kit-ty-kate
@ 2021-05-23 16:20 ` kit-ty-kate
  2021-05-23 16:48 ` [PR PATCH] [Updated] " leahneukirchen
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: kit-ty-kate @ 2021-05-23 16:20 UTC (permalink / raw)
  To: ml

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

New comment by kit-ty-kate on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-846588560

Comment:
`libguestfs` 1.44.1 should support OCaml 4.12: https://download.libguestfs.org/1.44-stable/libguestfs-1.44.1.tar.gz

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (5 preceding siblings ...)
  2021-05-23 16:20 ` kit-ty-kate
@ 2021-05-23 16:48 ` leahneukirchen
  2021-05-23 16:58 ` leahneukirchen
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-05-23 16:48 UTC (permalink / raw)
  To: ml

[-- 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
- [x] 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: 14171 bytes --]

From afe7a9a89ef9808a59867156cb8e3f3016c6e7d7 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/16] 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 c941d4b33684..70cb82442f2b 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 d945d29ba92fc21d0bff44a5f729e22bccb69fb6 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/16] ocaml-findlib: update to 1.9.1.

---
 srcpkgs/ocaml-findlib/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 93ec4b9e6bce..050445e19224 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,18 +1,18 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.8.1
-revision=4
+version=1.9.1
+revision=1
+wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
-makedepends="m4 ncurses-devel ocaml ocamlbuild"
+makedepends="ncurses-devel ocaml ocamlbuild"
 short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
-wrksrc="findlib-${version}"
+checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
 nocross=yes
 nopie=yes
 disable_parallel_build=yes
@@ -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 98806722e388a2e466299f3cde2394d02572eeb2 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/16] 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 736c1361b3db..faa7b02c15c5 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 6c649d77dac6c8714898d153140884102c6e67a0 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/16] 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 642476093c2a..4c14a4143b18 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 d5ebeef65568756602678e920b15a273206cc7b9 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/16] 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 c0caeba4be2c..9be2cd0dbda0 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 3c357932702c503a9dcfe8db1bd82c4fff374686 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/16] 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 3b6b18ce5e85..696d3a4093e3 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 3814352311033e291d2a77a211292073bc0770b2 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/16] 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 6ea87921c50a..fee00bd4ae97 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 dfc50b9d6a0b6b2bf9fdcec16edc1b1a680f7b7f 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/16] 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 ec430863b4d1..c06f3dda3557 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 5b80074db9e21140ee34d81053b95f9c84428cce 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/16] 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 e1ef60da18c7..952b4b9c3dc2 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 f95bd03dbb4d41100fa8cf8ff1754d660df241d1 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/16] 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 67c1a011ba78..07052abf413f 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 1190e729dc2bd0749ce4a582ef8ea4163bd0ab4f 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/16] 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 ff5304205bc5..c088cb9a438c 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 262d43e0f9a1365b6cb0eadc723d4e3fd8415ec6 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/16] 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 8a58beb6fba3..125f2d856ee8 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 dd36866c0d63584d12c31f49acfe9e84416ec881 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/16] 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 514e22f76554..fe2835b1a9ef 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 9faea172eb4084b17c9298a05a8b9b4795fd7f2b 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/16] 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 ae46d8285868..c6066d1ef994 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.13.2
-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>"

From 415044da2e0ecd2b44647a0e7b4ced961d74e530 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:00 +0200
Subject: [PATCH 15/16] New package: ocaml-stdcompat-15

---
 srcpkgs/ocaml-stdcompat/template | 20 ++++++++++++++++++++
 srcpkgs/ocaml-stdcompat/update   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/ocaml-stdcompat/template
 create mode 100644 srcpkgs/ocaml-stdcompat/update

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
new file mode 100644
index 000000000000..b4b5128264c9
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -0,0 +1,20 @@
+# Template file for 'ocaml-stdcompat'
+pkgname=ocaml-stdcompat
+version=15
+revision=1
+wrksrc="stdcompat-${version}"
+build_style=gnu-configure
+configure_args="--libdir=/usr/lib/ocaml"
+makedepends="ocaml ocaml-findlib"
+short_desc="Compatibility module for OCaml standard library"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/thierry-martinez/stdcompat"
+distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
+checksum=5e746f68ffe451e7dabe9d961efeef36516b451f35a96e174b8f929a44599cf5
+nocross=yes
+disable_parallel_build=yes
+
+post_install() {
+	vlicense COPYING LICENSE
+}
diff --git a/srcpkgs/ocaml-stdcompat/update b/srcpkgs/ocaml-stdcompat/update
new file mode 100644
index 000000000000..2c4c1498b417
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/update
@@ -0,0 +1 @@
+pkgname=stdcompat

From 1ba2621dacd6e5f0f719e2f11cb89bb0e59c044c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:22 +0200
Subject: [PATCH 16/16] coccinelle: update to 1.1.0.

---
 srcpkgs/coccinelle/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 310f9d432619..3bd2f676d120 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,18 +1,19 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
-version=1.0.8
-revision=5
+version=1.1.0
+revision=1
 build_style=gnu-configure
-configure_args="--without-pdflatex --enable-release
+configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"
 hostmakedepends="python3 automake libtool"
-makedepends="ocaml ocaml-findlib ocaml-num pcre-devel python3-devel"
+makedepends="ocaml ocaml-findlib ocaml-num ocaml-stdcompat
+ pcre-devel python3-devel"
 short_desc="Program matching and transformation engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://coccinelle.lip6.fr/"
 distfiles="https://github.com/coccinelle/coccinelle/archive/${version}.tar.gz"
-checksum=9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f
+checksum=e40bdd51eda84f9bf3154c592ebb4af73a4dd9656c03e7ca1d3aa0247d98d185
 disable_parallel_build=yes
 nocross=yes
 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (6 preceding siblings ...)
  2021-05-23 16:48 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-05-23 16:58 ` leahneukirchen
  2021-07-16 19:42 ` leahneukirchen
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-05-23 16:58 UTC (permalink / raw)
  To: ml

[-- 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
- [x] 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: 15014 bytes --]

From 0472eb8c4b78cc588ba42a394850698ac455ac73 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/17] ocaml: update to 4.12.0.

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

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index c941d4b33684..38fe9cb5be87 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,9 +1,9 @@
 # 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"
+configure_args="--with-pic"
 make_build_target="world.opt"
 makedepends="ncurses-devel libX11-devel"
 short_desc="Main implementation of the Caml language"
@@ -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 1ea8bd75e2afc394d735607cb6b22866bc5efcf7 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/17] ocaml-findlib: update to 1.9.1.

---
 srcpkgs/ocaml-findlib/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 93ec4b9e6bce..050445e19224 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,18 +1,18 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.8.1
-revision=4
+version=1.9.1
+revision=1
+wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
-makedepends="m4 ncurses-devel ocaml ocamlbuild"
+makedepends="ncurses-devel ocaml ocamlbuild"
 short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
-wrksrc="findlib-${version}"
+checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
 nocross=yes
 nopie=yes
 disable_parallel_build=yes
@@ -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 4a0007841c7b9785f643b9d0604e6bc7ff278dd9 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/17] 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 736c1361b3db..faa7b02c15c5 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 e1d51809a0da64d496d10f0933739e55547f258e 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/17] 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 642476093c2a..4c14a4143b18 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 46b736405c891e3628a449be489dcf85ea494409 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/17] 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 c0caeba4be2c..9be2cd0dbda0 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 86f3f4008053aafad2604dba2d520709226d71e3 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/17] 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 3b6b18ce5e85..696d3a4093e3 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 43917b41c720ea3bd808f7171355d63293bae9c9 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/17] 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 6ea87921c50a..fee00bd4ae97 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 5fcc0d82e3f97fac230fd2f91aa4b30c59eaf6bb 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/17] 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 ec430863b4d1..c06f3dda3557 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 1344d43114051bf8c56e18ae4b0a4cbfd9ec0b0c 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/17] 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 e1ef60da18c7..952b4b9c3dc2 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 301862fca7b122e42bbf917986d37b675239fbed 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/17] 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 67c1a011ba78..07052abf413f 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 84191f3b213967272599c95026b78d0bd2e31e3c 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/17] 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 ff5304205bc5..c088cb9a438c 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 b562782e81b1d14cd41121932d823e66d9fef5ab 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/17] 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 8a58beb6fba3..125f2d856ee8 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 22429f4040398204bcb9419e2fa047e1dbf86832 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/17] 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 514e22f76554..fe2835b1a9ef 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 11ad9f01b795349389ba8b57e812c2b9def0e2f9 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/17] 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 ae46d8285868..c6066d1ef994 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.13.2
-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>"

From 8e60b47268d1244e738453a4b6e415a2e75ab5bd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:00 +0200
Subject: [PATCH 15/17] New package: ocaml-stdcompat-15

---
 srcpkgs/ocaml-stdcompat/template | 20 ++++++++++++++++++++
 srcpkgs/ocaml-stdcompat/update   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/ocaml-stdcompat/template
 create mode 100644 srcpkgs/ocaml-stdcompat/update

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
new file mode 100644
index 000000000000..b4b5128264c9
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -0,0 +1,20 @@
+# Template file for 'ocaml-stdcompat'
+pkgname=ocaml-stdcompat
+version=15
+revision=1
+wrksrc="stdcompat-${version}"
+build_style=gnu-configure
+configure_args="--libdir=/usr/lib/ocaml"
+makedepends="ocaml ocaml-findlib"
+short_desc="Compatibility module for OCaml standard library"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/thierry-martinez/stdcompat"
+distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
+checksum=5e746f68ffe451e7dabe9d961efeef36516b451f35a96e174b8f929a44599cf5
+nocross=yes
+disable_parallel_build=yes
+
+post_install() {
+	vlicense COPYING LICENSE
+}
diff --git a/srcpkgs/ocaml-stdcompat/update b/srcpkgs/ocaml-stdcompat/update
new file mode 100644
index 000000000000..2c4c1498b417
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/update
@@ -0,0 +1 @@
+pkgname=stdcompat

From 1d21fac608b46158b14701b34671cad2771f51fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:22 +0200
Subject: [PATCH 16/17] coccinelle: update to 1.1.0.

---
 srcpkgs/coccinelle/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 310f9d432619..3bd2f676d120 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,18 +1,19 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
-version=1.0.8
-revision=5
+version=1.1.0
+revision=1
 build_style=gnu-configure
-configure_args="--without-pdflatex --enable-release
+configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"
 hostmakedepends="python3 automake libtool"
-makedepends="ocaml ocaml-findlib ocaml-num pcre-devel python3-devel"
+makedepends="ocaml ocaml-findlib ocaml-num ocaml-stdcompat
+ pcre-devel python3-devel"
 short_desc="Program matching and transformation engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://coccinelle.lip6.fr/"
 distfiles="https://github.com/coccinelle/coccinelle/archive/${version}.tar.gz"
-checksum=9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f
+checksum=e40bdd51eda84f9bf3154c592ebb4af73a4dd9656c03e7ca1d3aa0247d98d185
 disable_parallel_build=yes
 nocross=yes
 

From 11725e65664f459c879287649fba9e8a2d41aabd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:55:06 +0200
Subject: [PATCH 17/17] libguestfs: rebuild for ocaml-4.12.0.

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

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 81afe313d203..dc2d65e2960e 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.44.1
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (7 preceding siblings ...)
  2021-05-23 16:58 ` leahneukirchen
@ 2021-07-16 19:42 ` leahneukirchen
  2021-07-16 19:45 ` leahneukirchen
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-07-16 19:42 UTC (permalink / raw)
  To: ml

[-- 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
- [x] libguestfs
- [ ] unison
- [ ] polygen
- [x] 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: 19802 bytes --]

From 744ecc634fd556fd723fa75666c1ae4acc12e166 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/19] ocaml: update to 4.12.0.

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

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 0b760f5ffa5a..4bc8658c84da 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,9 +1,9 @@
 # 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"
+configure_args="--with-pic"
 make_build_target="world.opt"
 makedepends="ncurses-devel libX11-devel"
 short_desc="Main implementation of the Caml language"
@@ -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
 
 export ASPP="cc -c"

From 78bb944aca8afa4b5a80711395cda0f7b3fe57d2 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/19] ocaml-findlib: update to 1.9.1.

---
 srcpkgs/ocaml-findlib/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 93ec4b9e6bce..050445e19224 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,18 +1,18 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.8.1
-revision=4
+version=1.9.1
+revision=1
+wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
-makedepends="m4 ncurses-devel ocaml ocamlbuild"
+makedepends="ncurses-devel ocaml ocamlbuild"
 short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
-wrksrc="findlib-${version}"
+checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
 nocross=yes
 nopie=yes
 disable_parallel_build=yes
@@ -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 68648f23f32e4770b1ed55a8ad0cd6d2b9a8337e 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/19] 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 736c1361b3db..faa7b02c15c5 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 c87e2a8b2018afbdb48864c1c3b5765cc5a0cf87 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/19] 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 642476093c2a..4c14a4143b18 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 e87da9df8753bfd2cf9a9b6f6edc60f3e0479fab 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/19] 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 c0caeba4be2c..9be2cd0dbda0 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 d65b602b80af515338f9bcddbeb613d6602ae349 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/19] 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 3b6b18ce5e85..696d3a4093e3 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 c1c6d674260a2dd08e3264ac9ac8474402b64ebc 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/19] 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 6ea87921c50a..fee00bd4ae97 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 a50046c20193b0e071d35504bc6b90a08df292be 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/19] 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 ec430863b4d1..c06f3dda3557 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 423d104b4da81f220f823307459efafd78f321ea 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/19] 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 e1ef60da18c7..952b4b9c3dc2 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 fed09adcdbe1354e807e95422773879c7a7e2253 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/19] 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 67c1a011ba78..07052abf413f 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 645775621927d6a9b4b31e4a06892ee6746863a7 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/19] 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 ff5304205bc5..c088cb9a438c 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 4c0ec9d106bef1b9ca2679a308ece88e358bd9b8 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/19] 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 3a58cf593776..6b4e3a46ccc0 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From 933921e23c9692bc366ee90b17db751be83e0afd 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/19] 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 514e22f76554..fe2835b1a9ef 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 a48a26d1b36248fac6181890f7661449275dfa15 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/19] 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 ae46d8285868..c6066d1ef994 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.13.2
-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>"

From 2ad161596eb821ba2f10dad136a6375598b05f2a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:00 +0200
Subject: [PATCH 15/19] New package: ocaml-stdcompat-15

---
 srcpkgs/ocaml-stdcompat/template | 20 ++++++++++++++++++++
 srcpkgs/ocaml-stdcompat/update   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/ocaml-stdcompat/template
 create mode 100644 srcpkgs/ocaml-stdcompat/update

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
new file mode 100644
index 000000000000..b4b5128264c9
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -0,0 +1,20 @@
+# Template file for 'ocaml-stdcompat'
+pkgname=ocaml-stdcompat
+version=15
+revision=1
+wrksrc="stdcompat-${version}"
+build_style=gnu-configure
+configure_args="--libdir=/usr/lib/ocaml"
+makedepends="ocaml ocaml-findlib"
+short_desc="Compatibility module for OCaml standard library"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/thierry-martinez/stdcompat"
+distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
+checksum=5e746f68ffe451e7dabe9d961efeef36516b451f35a96e174b8f929a44599cf5
+nocross=yes
+disable_parallel_build=yes
+
+post_install() {
+	vlicense COPYING LICENSE
+}
diff --git a/srcpkgs/ocaml-stdcompat/update b/srcpkgs/ocaml-stdcompat/update
new file mode 100644
index 000000000000..2c4c1498b417
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/update
@@ -0,0 +1 @@
+pkgname=stdcompat

From ac011ffbb32f114d2f25e3ecf6bac68074990db9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:22 +0200
Subject: [PATCH 16/19] coccinelle: update to 1.1.0.

---
 srcpkgs/coccinelle/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 310f9d432619..3bd2f676d120 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,18 +1,19 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
-version=1.0.8
-revision=5
+version=1.1.0
+revision=1
 build_style=gnu-configure
-configure_args="--without-pdflatex --enable-release
+configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"
 hostmakedepends="python3 automake libtool"
-makedepends="ocaml ocaml-findlib ocaml-num pcre-devel python3-devel"
+makedepends="ocaml ocaml-findlib ocaml-num ocaml-stdcompat
+ pcre-devel python3-devel"
 short_desc="Program matching and transformation engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://coccinelle.lip6.fr/"
 distfiles="https://github.com/coccinelle/coccinelle/archive/${version}.tar.gz"
-checksum=9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f
+checksum=e40bdd51eda84f9bf3154c592ebb4af73a4dd9656c03e7ca1d3aa0247d98d185
 disable_parallel_build=yes
 nocross=yes
 

From 622d3edda015575a9f8189f24227cfc41a385d7c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:55:06 +0200
Subject: [PATCH 17/19] libguestfs: rebuild for ocaml-4.12.0.

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

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 81afe313d203..dc2d65e2960e 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.44.1
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From 0e145872e9537756ea0c8d218db891318a8e352c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jul 2021 21:22:52 +0200
Subject: [PATCH 18/19] unison: update to 2.51.4.

---
 srcpkgs/unison/patches/musl.patch | 11 -----------
 srcpkgs/unison/template           |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/unison/patches/musl.patch

diff --git a/srcpkgs/unison/patches/musl.patch b/srcpkgs/unison/patches/musl.patch
deleted file mode 100644
index d9bbf9cb4a33..000000000000
--- a/srcpkgs/unison/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/fsmonitor/linux/inotify_stubs.c
-+++ b/src/fsmonitor/linux/inotify_stubs.c
-@@ -35,7 +35,7 @@
- #define GLIBC_SUPPORT_INOTIFY 0
- #endif
-
--#if GLIBC_SUPPORT_INOTIFY
-+#if GLIBC_SUPPORT_INOTIFY || (!defined(__GLIBC__) && defined(__linux))
- #include <sys/inotify.h>
- #else
- #include "inotify_compat.h"
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 3d86606a7d75..14d558107859 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,14 +1,14 @@
 # Template file for 'unison'
 pkgname=unison
-version=2.51.3
-revision=2
+version=2.51.4
+revision=1
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
+checksum=d1ecc7581aaf2ed0f3403d4960f468acd7b9f1d92838a17c96e6d1df79b802d5
 nocross="OCaml does not cross compile"
 
 do_build() {

From bbfa59606ee14e9f735c338685ee11dcc55baa13 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jul 2021 21:41:37 +0200
Subject: [PATCH 19/19] xen: rebuild for ocaml-4.12.0.

---
 srcpkgs/xen/patches/ocaml-4.12.patch | 36 ++++++++++++++++++++++++++++
 srcpkgs/xen/template                 |  5 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xen/patches/ocaml-4.12.patch

diff --git a/srcpkgs/xen/patches/ocaml-4.12.patch b/srcpkgs/xen/patches/ocaml-4.12.patch
new file mode 100644
index 000000000000..32ec8657e3b5
--- /dev/null
+++ b/srcpkgs/xen/patches/ocaml-4.12.patch
@@ -0,0 +1,36 @@
+2021-04-06 - Anton Farygin <rider@altlinux.org> 4.14.1-alt2
+- fixed build with ocaml-4.12.0
+
+--- xen-4.14.1/tools/ocaml/libs/xentoollog/xentoollog_stubs.c.orig	2020-12-17 16:47:25.000000000 +0000
++++ xen-4.14.1/tools/ocaml/libs/xentoollog/xentoollog_stubs.c	2021-03-01 22:53:23.106205483 +0000
+@@ -53,8 +53,6 @@
+ #include "_xtl_levels.inc"
+ 
+ /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
+-#define Val_none Val_int(0)
+-#define Some_val(v) Field(v,0)
+ 
+ static value Val_some(value v)
+ {
+--- xen-4.14.1/tools/ocaml/libs/xl/xenlight_stubs.c.orig	2020-12-17 16:47:25.000000000 +0000
++++ xen-4.14.1/tools/ocaml/libs/xl/xenlight_stubs.c	2021-03-01 23:01:24.229859714 +0000
+@@ -227,8 +227,6 @@
+ }
+ 
+ /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
+-#define Val_none Val_int(0)
+-#define Some_val(v) Field(v,0)
+ 
+ static value Val_some(value v)
+ {
+--- xen-4.14.1/tools/ocaml/libs/xc/xenctrl_stubs.c.orig	2020-12-17 16:47:25.000000000 +0000
++++ xen-4.14.1/tools/ocaml/libs/xc/xenctrl_stubs.c	2021-03-01 23:24:45.477290290 +0000
+@@ -43,8 +43,6 @@
+ #define _H(__h) ((xc_interface *)(__h))
+ #define _D(__d) ((uint32_t)Int_val(__d))
+ 
+-#define Val_none (Val_int(0))
+-
+ #define string_of_option_array(array, index) \
+ 	((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
+ 
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index d916f29ac384..930296532e9f 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=2
+revision=3
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -14,7 +14,8 @@ hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript gi
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
- netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
+ netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
+ ncurses-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"
 maintainer="Chris Brannon <chris@the-brannons.com>"

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (8 preceding siblings ...)
  2021-07-16 19:42 ` leahneukirchen
@ 2021-07-16 19:45 ` leahneukirchen
  2021-07-16 19:47 ` thypon
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-07-16 19:45 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-881678077

Comment:
@thypon I'm tempted to remove polygen, it's upstream unmaintained and really not very useful...

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (9 preceding siblings ...)
  2021-07-16 19:45 ` leahneukirchen
@ 2021-07-16 19:47 ` thypon
  2021-07-16 19:56 ` leahneukirchen
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: thypon @ 2021-07-16 19:47 UTC (permalink / raw)
  To: ml

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

New comment by thypon on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-881679055

Comment:
Go for it. It is just a toy project anyway. I'm not sure anybody uses it in voidlinux besides me. Package popularity-context or download count could had helped.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (10 preceding siblings ...)
  2021-07-16 19:47 ` thypon
@ 2021-07-16 19:56 ` leahneukirchen
  2021-07-16 19:58 ` [PR PATCH] [Updated] " leahneukirchen
  2021-07-17 14:54 ` [PR PATCH] [Merged]: " leahneukirchen
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-07-16 19:56 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/29279#issuecomment-881683618

Comment:
Polygen has popcorn = 1.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (11 preceding siblings ...)
  2021-07-16 19:56 ` leahneukirchen
@ 2021-07-16 19:58 ` leahneukirchen
  2021-07-17 14:54 ` [PR PATCH] [Merged]: " leahneukirchen
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-07-16 19:58 UTC (permalink / raw)
  To: ml

[-- 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:

- [x] xen
- [x] libguestfs
- [x] unison
- [ ] polygen
- [x] 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: 21759 bytes --]

From 059433205cd7f032153534f7c63ee40bed359d9f 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/20] ocaml: update to 4.12.0.

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

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 0b760f5ffa5a..4bc8658c84da 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,9 +1,9 @@
 # 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"
+configure_args="--with-pic"
 make_build_target="world.opt"
 makedepends="ncurses-devel libX11-devel"
 short_desc="Main implementation of the Caml language"
@@ -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
 
 export ASPP="cc -c"

From 76a9401b62e8361505f3480cc7cfa183bcf04ecf 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/20] ocaml-findlib: update to 1.9.1.

---
 srcpkgs/ocaml-findlib/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 93ec4b9e6bce..050445e19224 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,18 +1,18 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.8.1
-revision=4
+version=1.9.1
+revision=1
+wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
-makedepends="m4 ncurses-devel ocaml ocamlbuild"
+makedepends="ncurses-devel ocaml ocamlbuild"
 short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
-wrksrc="findlib-${version}"
+checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
 nocross=yes
 nopie=yes
 disable_parallel_build=yes
@@ -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 8ca2c114841eec602be069f4835f5190add0c385 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/20] 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 736c1361b3db..faa7b02c15c5 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 7ad1366fd0e337b6c99febd40b3e2acbdfc13cac 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/20] 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 642476093c2a..4c14a4143b18 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 9655b0dfeab1b2d257ff29e056b6856d9552c6a7 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/20] 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 c0caeba4be2c..9be2cd0dbda0 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 a5cb6a23572dd932a9174532e3d384ab27761d26 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/20] 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 3b6b18ce5e85..696d3a4093e3 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 7d6c14f20e2efe95b57e033f4a666d3cba71bdca 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/20] 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 6ea87921c50a..fee00bd4ae97 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 5bfda148d4c0f6fee464e0f8e69b887d25e81231 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/20] 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 ec430863b4d1..c06f3dda3557 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 df8caab1f77c6b6d804711e885bdf8ac2ef25e00 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/20] 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 e1ef60da18c7..952b4b9c3dc2 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 b8a8e41e4fceb45796e80f10641feeaffb4b8877 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/20] 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 67c1a011ba78..07052abf413f 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 1643ae8735a416b3f07e460792d2afe889212b2c 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/20] 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 ff5304205bc5..c088cb9a438c 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 7a3d65cbfa31519a930d038c012a37b62134793d 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/20] 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 3a58cf593776..6b4e3a46ccc0 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From a68603ee076d19ee7bc2e3ef0ba6a40d322759e2 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/20] 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 514e22f76554..fe2835b1a9ef 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 b36efd988675065e77fff0e74dc8a03ecbb4f9ea 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/20] 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 ae46d8285868..c6066d1ef994 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.13.2
-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>"

From b24feaeaf330c25badbd6a44af5475eabc852710 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:00 +0200
Subject: [PATCH 15/20] New package: ocaml-stdcompat-15

---
 srcpkgs/ocaml-stdcompat/template | 20 ++++++++++++++++++++
 srcpkgs/ocaml-stdcompat/update   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/ocaml-stdcompat/template
 create mode 100644 srcpkgs/ocaml-stdcompat/update

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
new file mode 100644
index 000000000000..b4b5128264c9
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -0,0 +1,20 @@
+# Template file for 'ocaml-stdcompat'
+pkgname=ocaml-stdcompat
+version=15
+revision=1
+wrksrc="stdcompat-${version}"
+build_style=gnu-configure
+configure_args="--libdir=/usr/lib/ocaml"
+makedepends="ocaml ocaml-findlib"
+short_desc="Compatibility module for OCaml standard library"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/thierry-martinez/stdcompat"
+distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
+checksum=5e746f68ffe451e7dabe9d961efeef36516b451f35a96e174b8f929a44599cf5
+nocross=yes
+disable_parallel_build=yes
+
+post_install() {
+	vlicense COPYING LICENSE
+}
diff --git a/srcpkgs/ocaml-stdcompat/update b/srcpkgs/ocaml-stdcompat/update
new file mode 100644
index 000000000000..2c4c1498b417
--- /dev/null
+++ b/srcpkgs/ocaml-stdcompat/update
@@ -0,0 +1 @@
+pkgname=stdcompat

From 40f7161aa28572817ed89d3dcbd4297c43e8fb43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:47:22 +0200
Subject: [PATCH 16/20] coccinelle: update to 1.1.0.

---
 srcpkgs/coccinelle/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 310f9d432619..3bd2f676d120 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,18 +1,19 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
-version=1.0.8
-revision=5
+version=1.1.0
+revision=1
 build_style=gnu-configure
-configure_args="--without-pdflatex --enable-release
+configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"
 hostmakedepends="python3 automake libtool"
-makedepends="ocaml ocaml-findlib ocaml-num pcre-devel python3-devel"
+makedepends="ocaml ocaml-findlib ocaml-num ocaml-stdcompat
+ pcre-devel python3-devel"
 short_desc="Program matching and transformation engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://coccinelle.lip6.fr/"
 distfiles="https://github.com/coccinelle/coccinelle/archive/${version}.tar.gz"
-checksum=9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f
+checksum=e40bdd51eda84f9bf3154c592ebb4af73a4dd9656c03e7ca1d3aa0247d98d185
 disable_parallel_build=yes
 nocross=yes
 

From a82aedfd36ba2bcd74893dcf087fc0537bddf6bf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 23 May 2021 18:55:06 +0200
Subject: [PATCH 17/20] libguestfs: rebuild for ocaml-4.12.0.

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

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 81afe313d203..dc2d65e2960e 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.44.1
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From 6de47ac1dfdeb38e3f4dbdfb83dbcb40c32910f1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jul 2021 21:22:52 +0200
Subject: [PATCH 18/20] unison: update to 2.51.4.

---
 srcpkgs/unison/patches/musl.patch | 11 -----------
 srcpkgs/unison/template           |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/unison/patches/musl.patch

diff --git a/srcpkgs/unison/patches/musl.patch b/srcpkgs/unison/patches/musl.patch
deleted file mode 100644
index d9bbf9cb4a33..000000000000
--- a/srcpkgs/unison/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/fsmonitor/linux/inotify_stubs.c
-+++ b/src/fsmonitor/linux/inotify_stubs.c
-@@ -35,7 +35,7 @@
- #define GLIBC_SUPPORT_INOTIFY 0
- #endif
-
--#if GLIBC_SUPPORT_INOTIFY
-+#if GLIBC_SUPPORT_INOTIFY || (!defined(__GLIBC__) && defined(__linux))
- #include <sys/inotify.h>
- #else
- #include "inotify_compat.h"
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 3d86606a7d75..14d558107859 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,14 +1,14 @@
 # Template file for 'unison'
 pkgname=unison
-version=2.51.3
-revision=2
+version=2.51.4
+revision=1
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
+checksum=d1ecc7581aaf2ed0f3403d4960f468acd7b9f1d92838a17c96e6d1df79b802d5
 nocross="OCaml does not cross compile"
 
 do_build() {

From a66297d80902d17bcd71e6eefb3fa6ef88af5679 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jul 2021 21:41:37 +0200
Subject: [PATCH 19/20] xen: rebuild for ocaml-4.12.0.

---
 srcpkgs/xen/patches/ocaml-4.12.patch | 36 ++++++++++++++++++++++++++++
 srcpkgs/xen/template                 |  5 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xen/patches/ocaml-4.12.patch

diff --git a/srcpkgs/xen/patches/ocaml-4.12.patch b/srcpkgs/xen/patches/ocaml-4.12.patch
new file mode 100644
index 000000000000..32ec8657e3b5
--- /dev/null
+++ b/srcpkgs/xen/patches/ocaml-4.12.patch
@@ -0,0 +1,36 @@
+2021-04-06 - Anton Farygin <rider@altlinux.org> 4.14.1-alt2
+- fixed build with ocaml-4.12.0
+
+--- xen-4.14.1/tools/ocaml/libs/xentoollog/xentoollog_stubs.c.orig	2020-12-17 16:47:25.000000000 +0000
++++ xen-4.14.1/tools/ocaml/libs/xentoollog/xentoollog_stubs.c	2021-03-01 22:53:23.106205483 +0000
+@@ -53,8 +53,6 @@
+ #include "_xtl_levels.inc"
+ 
+ /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
+-#define Val_none Val_int(0)
+-#define Some_val(v) Field(v,0)
+ 
+ static value Val_some(value v)
+ {
+--- xen-4.14.1/tools/ocaml/libs/xl/xenlight_stubs.c.orig	2020-12-17 16:47:25.000000000 +0000
++++ xen-4.14.1/tools/ocaml/libs/xl/xenlight_stubs.c	2021-03-01 23:01:24.229859714 +0000
+@@ -227,8 +227,6 @@
+ }
+ 
+ /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
+-#define Val_none Val_int(0)
+-#define Some_val(v) Field(v,0)
+ 
+ static value Val_some(value v)
+ {
+--- xen-4.14.1/tools/ocaml/libs/xc/xenctrl_stubs.c.orig	2020-12-17 16:47:25.000000000 +0000
++++ xen-4.14.1/tools/ocaml/libs/xc/xenctrl_stubs.c	2021-03-01 23:24:45.477290290 +0000
+@@ -43,8 +43,6 @@
+ #define _H(__h) ((xc_interface *)(__h))
+ #define _D(__d) ((uint32_t)Int_val(__d))
+ 
+-#define Val_none (Val_int(0))
+-
+ #define string_of_option_array(array, index) \
+ 	((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
+ 
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index d916f29ac384..930296532e9f 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=2
+revision=3
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -14,7 +14,8 @@ hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript gi
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
- netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
+ netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
+ ncurses-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"
 maintainer="Chris Brannon <chris@the-brannons.com>"

From 7d8df55dd5534a4a16aa592b8617a94be737513c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Jul 2021 21:57:12 +0200
Subject: [PATCH 20/20] polygen: remove package, upstream unmaintained and
 breaks all the time.

---
 srcpkgs/polygen/patches/ocaml-4.05.patch | 11 -----------
 srcpkgs/polygen/template                 | 25 ------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 srcpkgs/polygen/patches/ocaml-4.05.patch
 delete mode 100644 srcpkgs/polygen/template

diff --git a/srcpkgs/polygen/patches/ocaml-4.05.patch b/srcpkgs/polygen/patches/ocaml-4.05.patch
deleted file mode 100644
index ae089ba69733..000000000000
--- a/srcpkgs/polygen/patches/ocaml-4.05.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/check.ml
-+++ b/src/check.ml
-@@ -37,7 +37,7 @@
- 
- 	  	let of_labels labels = List.fold_left (fun lbs lb -> add (lb, None) lbs) empty labels
- 	  	let occurs lb lbs = mem (lb, None) lbs
--        let pretty lbs = "{ " ^ (flatten_strings ", " (map fst (elements lbs))) ^ " }"
-+        let pretty lbs = "{ " ^ (flatten_strings ", " (List.map fst (elements lbs))) ^ " }"
- 	  end
- 
- 
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
deleted file mode 100644
index 22811a9f7b99..000000000000
--- a/srcpkgs/polygen/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'polygen'
-pkgname=polygen
-version=1.0.6.ds2
-revision=8
-build_wrksrc="src"
-build_style=gnu-makefile
-hostmakedepends="ocaml unzip"
-short_desc="Generative grammar phrase generator"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2.0-or-later"
-homepage="http://www.polygen.org"
-distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-checksum=60dbcec8aedcbb2545202ad97d41e592f232b8fc842ea25a7998c88a385148d5
-nocross=yes
-
-do_check() {
-	:
-}
-do_install() {
-	vbin polygen
-
-	cd ${wrksrc}
-	vmkdir usr/share/
-	vcopy grm usr/share/${pkgname}
-}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Merged]: OCaml 4.12
  2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
                   ` (12 preceding siblings ...)
  2021-07-16 19:58 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-07-17 14:54 ` leahneukirchen
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2021-07-17 14:54 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

OCaml 4.12
https://github.com/void-linux/void-packages/pull/29279

Description:
First stab at it.

Currently broken:

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2021-07-17 14:54 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-06 20:18 [PR PATCH] OCaml 4.12 leahneukirchen
2021-03-06 20:19 ` [PR PATCH] [Updated] " leahneukirchen
2021-05-23 16:03 ` [PR REVIEW] " kit-ty-kate
2021-05-23 16:08 ` kit-ty-kate
2021-05-23 16:11 ` kit-ty-kate
2021-05-23 16:12 ` kit-ty-kate
2021-05-23 16:20 ` kit-ty-kate
2021-05-23 16:48 ` [PR PATCH] [Updated] " leahneukirchen
2021-05-23 16:58 ` leahneukirchen
2021-07-16 19:42 ` leahneukirchen
2021-07-16 19:45 ` leahneukirchen
2021-07-16 19:47 ` thypon
2021-07-16 19:56 ` leahneukirchen
2021-07-16 19:58 ` [PR PATCH] [Updated] " leahneukirchen
2021-07-17 14:54 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).