* [PR PATCH] ocaml: update to 4.13.1.
@ 2021-10-01 20:41 leahneukirchen
2021-10-03 11:05 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 1 reply; 2+ messages in thread
From: leahneukirchen @ 2021-10-01 20:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 781 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml413
https://github.com/void-linux/void-packages/pull/33225
ocaml: update to 4.13.1.
This one was pretty easy.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/33225.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml413-33225.patch --]
[-- Type: text/x-diff, Size: 14997 bytes --]
From 003fad9bb6449f60c2cce8a356a45d35a843c3c4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:22:38 +0200
Subject: [PATCH 01/20] ocaml: update to 4.13.1.
---
srcpkgs/ocaml/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 4bc8658c84da..6c4a9cf44161 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.12.0
+version=4.13.1
revision=1
build_style="gnu-configure"
configure_args="--with-pic"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="QPL-1.0, LGPL-2.1-only"
homepage="http://ocaml.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=adc07a3995362403f3cb11085a86354de08e5a7f9eb3c09be7bbcc38a3a26744
+checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
nocross=yes
export ASPP="cc -c"
From 5f42526cfecaa4936466049f0d8522e8cdcad9ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:22:54 +0200
Subject: [PATCH 02/20] ocaml-findlib: rebuild for ocaml-4.13.1.
---
srcpkgs/ocaml-findlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 050445e19224..ee4c78918e78 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.9.1
-revision=1
+revision=2
wrksrc="findlib-${version}"
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
From 835163679ccb84339fe15a2aeb25c92cdbda16a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:23:34 +0200
Subject: [PATCH 03/20] ocaml-num: rebuild for ocaml-4.13.1.
---
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 faa7b02c15c5..bfce4e7baf91 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=2
+revision=3
wrksrc="num-${version}"
build_style=gnu-makefile
make_install_target="findlib-install"
From 327a37ac86fe26df6b6afd5e2a9bfee3f6529f86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:23:49 +0200
Subject: [PATCH 04/20] ocaml-zarith: rebuild for ocaml-4.13.1.
---
srcpkgs/ocaml-zarith/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 4c14a4143b18..e3bb17fa7e5f 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.12
-revision=1
+revision=2
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From a2d5fe111a413a067c5fccb9e2590d7e1fcc915b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:23:57 +0200
Subject: [PATCH 05/20] ocamlbuild: rebuild for ocaml-4.13.1.
---
srcpkgs/ocamlbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 9be2cd0dbda0..e5bca0ed33d6 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=6
+revision=7
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
From 956ff8a2917b74a354807f235ba7bc2a00258299 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:27:30 +0200
Subject: [PATCH 06/20] ocaml-stdcompat: rebuild for ocaml-4.13.1.
---
srcpkgs/ocaml-stdcompat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index c719f4cc674d..2035a9a2c4fa 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-stdcompat'
pkgname=ocaml-stdcompat
version=16
-revision=1
+revision=2
wrksrc="stdcompat-${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/ocaml"
From 41c33a45dc6696d3a6b929810fcd49cdf2c48ddd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:30:21 +0200
Subject: [PATCH 07/20] hivex: rebuild for ocaml-4.13.1.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..3ac29c532c64 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 23841dd4e15659d1de8a9055cbf9b773fdd3dc3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:31:04 +0200
Subject: [PATCH 08/20] opam: rebuild for ocaml-4.13.1.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..6305e8019c11 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.1.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From 1d0d3ed56cf9bbdfc3b79e60af0cfc5a2793f552 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:32:10 +0200
Subject: [PATCH 09/20] ocaml-lablgtk2: rebuild for ocaml-4.13.1.
---
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 952b4b9c3dc2..c835e6b19d5d 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=3
+revision=4
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From 743226e1b0274486c1c2f4c4ead04d5b4348c85f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:32:54 +0200
Subject: [PATCH 10/20] pdfsandwich: rebuild for ocaml-4.13.1.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index 07052abf413f..f3603e064c90 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="ocaml perl"
makedepends="ocaml"
From 32d89bd0ea4487a20aeab9d2eeeeb6f06765c3f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:33:06 +0200
Subject: [PATCH 11/20] supermin: rebuild for ocaml-4.13.1.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index c088cb9a438c..09b45ddd429f 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.1
-revision=2
+revision=3
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From 9363b185a79683c42b76f478d9ac859a0ab77d7d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:33:28 +0200
Subject: [PATCH 12/20] z3: rebuild for ocaml-4.13.1.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 6b4e3a46ccc0..43fca894b542 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.12
-revision=2
+revision=3
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From 3e2f2488c745c505f7e7a40cef309dc0ab049f78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:34:20 +0200
Subject: [PATCH 13/20] zeroinstall: rebuild for ocaml-4.13.1.
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index fe2835b1a9ef..eb8e1ea24280 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
# Template file for 'zeroinstall'
pkgname=zeroinstall
version=2.17
-revision=4
+revision=5
wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
From f3608f5f2b25105a53d486f6a9cf0c75ff0ec871 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:35:50 +0200
Subject: [PATCH 14/20] coccinelle: rebuild for ocaml-4.13.1.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index f3f708b584f4..211c9bdb4394 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.1.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release --enable-opt
--with-python=/usr/bin/python3"
From 073e828bd19f377e83cc579b92b298573e468c14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:40:12 +0200
Subject: [PATCH 15/20] libguestfs: rebuild for ocaml-4.13.1.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 15682eff7d51..4ee141709df0 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.46.0
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From c18f2c85fbf01df5ced6ce11337662eb569c3bed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:04:17 +0200
Subject: [PATCH 16/20] unison: rebuild for ocaml-4.13.1.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 14d558107859..67c424a3b8af 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname=unison
version=2.51.4
-revision=1
+revision=2
hostmakedepends="ocaml"
short_desc="File-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From f746d42fc679822457963e92e7d80b5f21aa357a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:04:36 +0200
Subject: [PATCH 17/20] xen: rebuild for ocaml-4.13.1.
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index c8ad8ec65563..3565845e9dc3 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.14.1
-revision=3
+revision=4
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
# TODO: arm / aarch64
From 72f938e2dc545e47194347ef2902800a24f71fe5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:12:02 +0200
Subject: [PATCH 18/20] camlp5: update to 8.00.02.
---
srcpkgs/camlp5/template | 10 +++++-----
srcpkgs/camlp5/update | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 696d3a4093e3..712317edd85f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,8 +1,8 @@
# Template file for 'camlp5'
pkgname=camlp5
-version=7.14
-revision=2
-wrksrc="camlp5-rel${version//./}"
+version=8.00.02
+revision=1
+wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml perl"
@@ -10,8 +10,8 @@ short_desc="OCaml preprocessor and pretty-printer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://camlp5.github.io/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.tar.gz"
-checksum=6e84b9bc04e03b05bd1ec15500f0b8f4ef4ea81576a1aa7037ef01c84cf76da5
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version}.tar.gz"
+checksum=3c8c5c574b739cd9e4f0fd4881625ec4c67b456b64fc04ed2882e89a724577fd
nocross=yes
nopie=yes
diff --git a/srcpkgs/camlp5/update b/srcpkgs/camlp5/update
index 052b24ccd151..d3695ee92307 100644
--- a/srcpkgs/camlp5/update
+++ b/srcpkgs/camlp5/update
@@ -1,2 +1,2 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-|rel)?\K[\d\.]+(?=\.tar\.gz")'
-version="${version//./}"
+pattern='rel\K[\d\.]+(?=\.tar\.gz")'
+ignore='71?'
From 6adcb6e93dac1f73f1ffcd33842327d215825d10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:12:08 +0200
Subject: [PATCH 19/20] coq: rebuild for ocaml-4.13.1.
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index c6066d1ef994..503d994b5ff5 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
# Template file for 'coq'
pkgname=coq
version=8.13.2
-revision=2
+revision=3
hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
short_desc="Proof assistant written in OCaml"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 0eb9a46b73161790ba29ccce928932494cba9ecb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:29:06 +0200
Subject: [PATCH 20/20] mathcomp: rebuild for coq-8.13.2_3.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 17976c9e1ed2..f2a424aacb92 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.12.0
-revision=4
+revision=5
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: ocaml: update to 4.13.1.
2021-10-01 20:41 [PR PATCH] ocaml: update to 4.13.1 leahneukirchen
@ 2021-10-03 11:05 ` leahneukirchen
0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2021-10-03 11:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
There's a merged pull request on the void-packages repository
ocaml: update to 4.13.1.
https://github.com/void-linux/void-packages/pull/33225
Description:
This one was pretty easy.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-03 11:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-01 20:41 [PR PATCH] ocaml: update to 4.13.1 leahneukirchen
2021-10-03 11:05 ` [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).