From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] OCaml 4.12
Date: Sun, 23 May 2021 18:58:38 +0200 [thread overview]
Message-ID: <20210523165838.dKg6YKt7r5ucPr067khBg0ceBNcDbSt31RjKP3wr9_k@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29279@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2021-05-23 16:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 20:18 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210523165838.dKg6YKt7r5ucPr067khBg0ceBNcDbSt31RjKP3wr9_k@z \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).