Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / eliom
Commits: 9f5e5877 by Stephane Glondu at 2025-12-19T10:34:53+01:00 Fix compilation with OCaml 5.4.0 - - - - - e8221dc4 by Stephane Glondu at 2025-12-19T10:35:47+01:00 Update packaging - - - - - d14131a9 by Stephane Glondu at 2025-12-19T10:36:04+01:00 Update changelog - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/Fix-compilation-with-OCaml-5.4.0.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +eliom (11.1.1-5) UNRELEASED; urgency=medium + + * Fix compilation with OCaml 5.4.0 + * Remove Rules-Requires-Root + + -- Stéphane Glondu <[email protected]> Fri, 19 Dec 2025 10:34:57 +0100 + eliom (11.1.1-4) unstable; urgency=medium * Bring js_of_ocaml 6.2.0 changes more in line with upstream changes ===================================== debian/control ===================================== @@ -7,7 +7,7 @@ Uploaders: Build-Depends: debhelper-compat (= 13), dh-ocaml (>= 2), - ocaml, + ocaml (>= 5.4.0), ocaml-findlib, ocaml-dune (>= 3.6), ocamlbuild, @@ -25,7 +25,6 @@ Build-Depends: libppx-optcomp-ocaml-dev, opam-installer Standards-Version: 4.7.2 -Rules-Requires-Root: no Homepage: http://ocsigen.org/eliom Vcs-Browser: https://salsa.debian.org/ocaml-team/eliom Vcs-Git: https://salsa.debian.org/ocaml-team/eliom.git ===================================== debian/patches/Fix-compilation-with-OCaml-5.4.0.patch ===================================== @@ -0,0 +1,21 @@ +From: Stephane Glondu <[email protected]> +Date: Fri, 19 Dec 2025 10:34:35 +0100 +Subject: Fix compilation with OCaml 5.4.0 + +--- + src/ppx/ppx_eliom_utils.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ppx/ppx_eliom_utils.ml b/src/ppx/ppx_eliom_utils.ml +index 2d76b84..610411f 100644 +--- a/src/ppx/ppx_eliom_utils.ml ++++ b/src/ppx/ppx_eliom_utils.ml +@@ -362,7 +362,7 @@ module Cmo = struct + | ((Otyp_arrow (lab, ty1, ty2)) [@if ocaml_version < (5, 2, 0)]) -> + Typ.arrow (label_of_string lab) (type_of_out_type ty1) + (type_of_out_type ty2) +- | Otyp_tuple tyl -> Typ.tuple (List.map type_of_out_type tyl) ++ | Otyp_tuple tyl -> Typ.tuple (List.map (fun (_, x) -> type_of_out_type x) tyl) + | Otyp_constr (id, tyl) -> + Typ.constr + (mkloc (ident_of_out_ident id) Location.none) ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ Add-support-for-OCaml-5.3.patch Fix-compilation-with-ppxlib-0.36.0.patch Fix-compilation-with-js_of_ocaml-6.2.0.patch +Fix-compilation-with-OCaml-5.4.0.patch View it on GitLab: https://salsa.debian.org/ocaml-team/eliom/-/compare/45aba116bdc783dd28eef438d1004dd376d496ec...d14131a96150f412f77a2c7f91538c024686db1e -- View it on GitLab: https://salsa.debian.org/ocaml-team/eliom/-/compare/45aba116bdc783dd28eef438d1004dd376d496ec...d14131a96150f412f77a2c7f91538c024686db1e You're receiving this email because of your account on salsa.debian.org.
