Github messages for voidlinux
 help / color / mirror / Atom feed
From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] OCaml 4.12
Date: Fri, 16 Jul 2021 21:58:32 +0200	[thread overview]
Message-ID: <20210716195832.dvUSkVQNu3ldVJJhSIX7Uq8r5oydci9l8QWBY2nodTY@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:

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

  parent reply	other threads:[~2021-07-16 19: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
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 ` leahneukirchen [this message]
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=20210716195832.dvUSkVQNu3ldVJJhSIX7Uq8r5oydci9l8QWBY2nodTY@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).