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
-
e8221dc4
by Stephane Glondu at 2025-12-19T10:35:47+01:00
-
d14131a9
by Stephane Glondu at 2025-12-19T10:36:04+01:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/Fix-compilation-with-OCaml-5.4.0.patch
- debian/patches/series
Changes:
| 1 | +eliom (11.1.1-5) UNRELEASED; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Fix compilation with OCaml 5.4.0
|
|
| 4 | + * Remove Rules-Requires-Root
|
|
| 5 | + |
|
| 6 | + -- Stéphane Glondu <glondu@debian.org> Fri, 19 Dec 2025 10:34:57 +0100
|
|
| 7 | + |
|
| 1 | 8 | eliom (11.1.1-4) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * Bring js_of_ocaml 6.2.0 changes more in line with upstream changes
|
| ... | ... | @@ -7,7 +7,7 @@ Uploaders: |
| 7 | 7 | Build-Depends:
|
| 8 | 8 | debhelper-compat (= 13),
|
| 9 | 9 | dh-ocaml (>= 2),
|
| 10 | - ocaml,
|
|
| 10 | + ocaml (>= 5.4.0),
|
|
| 11 | 11 | ocaml-findlib,
|
| 12 | 12 | ocaml-dune (>= 3.6),
|
| 13 | 13 | ocamlbuild,
|
| ... | ... | @@ -25,7 +25,6 @@ Build-Depends: |
| 25 | 25 | libppx-optcomp-ocaml-dev,
|
| 26 | 26 | opam-installer
|
| 27 | 27 | Standards-Version: 4.7.2
|
| 28 | -Rules-Requires-Root: no
|
|
| 29 | 28 | Homepage: http://ocsigen.org/eliom
|
| 30 | 29 | Vcs-Browser: https://salsa.debian.org/ocaml-team/eliom
|
| 31 | 30 | Vcs-Git: https://salsa.debian.org/ocaml-team/eliom.git
|
| 1 | +From: Stephane Glondu <steph@glondu.net>
|
|
| 2 | +Date: Fri, 19 Dec 2025 10:34:35 +0100
|
|
| 3 | +Subject: Fix compilation with OCaml 5.4.0
|
|
| 4 | + |
|
| 5 | +---
|
|
| 6 | + src/ppx/ppx_eliom_utils.ml | 2 +-
|
|
| 7 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
| 8 | + |
|
| 9 | +diff --git a/src/ppx/ppx_eliom_utils.ml b/src/ppx/ppx_eliom_utils.ml
|
|
| 10 | +index 2d76b84..610411f 100644
|
|
| 11 | +--- a/src/ppx/ppx_eliom_utils.ml
|
|
| 12 | ++++ b/src/ppx/ppx_eliom_utils.ml
|
|
| 13 | +@@ -362,7 +362,7 @@ module Cmo = struct
|
|
| 14 | + | ((Otyp_arrow (lab, ty1, ty2)) [@if ocaml_version < (5, 2, 0)]) ->
|
|
| 15 | + Typ.arrow (label_of_string lab) (type_of_out_type ty1)
|
|
| 16 | + (type_of_out_type ty2)
|
|
| 17 | +- | Otyp_tuple tyl -> Typ.tuple (List.map type_of_out_type tyl)
|
|
| 18 | ++ | Otyp_tuple tyl -> Typ.tuple (List.map (fun (_, x) -> type_of_out_type x) tyl)
|
|
| 19 | + | Otyp_constr (id, tyl) ->
|
|
| 20 | + Typ.constr
|
|
| 21 | + (mkloc (ident_of_out_ident id) Location.none) |
| 1 | 1 | Add-support-for-OCaml-5.3.patch
|
| 2 | 2 | Fix-compilation-with-ppxlib-0.36.0.patch
|
| 3 | 3 | Fix-compilation-with-js_of_ocaml-6.2.0.patch
|
| 4 | +Fix-compilation-with-OCaml-5.4.0.patch |