Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocaml-gettext
Commits: 5aa6398d by Stephane Glondu at 2025-12-19T09:17:44+01:00 Fix compilation with OCaml 5.4.0 - - - - - a2036bc7 by Stephane Glondu at 2025-12-19T09:18:04+01:00 Update packaging - - - - - 06ea5d99 by Stephane Glondu at 2025-12-19T09:18:36+01:00 Update changelog - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0006-xgettext-Fix-type-for-OCaml-5.4.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +ocaml-gettext (0.5.0+really0.4.2-2) UNRELEASED; urgency=medium + + * Fix compilation with OCaml 5.4.0 + * Remove Rules-Requires-Root + + -- Stéphane Glondu <[email protected]> Fri, 19 Dec 2025 09:18:11 +0100 + ocaml-gettext (0.5.0+really0.4.2-1) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -16,12 +16,11 @@ Build-Depends: camlp4, libounit-ocaml-dev, ocaml-dune, ocaml-findlib, - ocaml + ocaml (>= 5.4.0) Standards-Version: 4.7.2 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-gettext.git Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-gettext Homepage: https://github.com/gildor478/ocaml-gettext -Rules-Requires-Root: no Package: libgettext-ocaml Architecture: any ===================================== debian/patches/0006-xgettext-Fix-type-for-OCaml-5.4.patch ===================================== @@ -0,0 +1,25 @@ +From: "Richard W.M. Jones" <[email protected]> +Date: Wed, 15 Oct 2025 09:24:18 +0100 +Subject: xgettext: Fix type for OCaml 5.4 + +Fixes: https://github.com/gildor478/ocaml-gettext/issues/40 +Signed-off-by: Richard W.M. Jones <[email protected]> + +Origin: https://github.com/gildor478/ocaml-gettext/pull/41 +--- + src/bin/ocaml-xgettext/xgettext.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml +index 8f54efc..aa12aed 100644 +--- a/src/bin/ocaml-xgettext/xgettext.ml ++++ b/src/bin/ocaml-xgettext/xgettext.ml +@@ -112,7 +112,7 @@ let rec is_like lid = function + | [] -> false + | func :: functions -> ( + match lid with +- | (Lident f | Ldot (_, f)) when f = func -> true ++ | (Lident f | Ldot (_, {txt = f; _})) when f = func -> true + | _ -> is_like lid functions ) + + let visit_expr (iterator : Ast_iterator.iterator) expr = ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ 0003-Fix-compilation-with-camomile-2.0.0.patch 0004-Fix-compilation-with-OCaml-5.x.patch 0005-Fix-compilation-with-OCaml-5.3.0.patch +0006-xgettext-Fix-type-for-OCaml-5.4.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ocaml-gettext/-/compare/855b4672950b21361f08430d2c99cd725a686004...06ea5d990d39979ff227588e479ee9dde1d69c88 -- View it on GitLab: https://salsa.debian.org/ocaml-team/ocaml-gettext/-/compare/855b4672950b21361f08430d2c99cd725a686004...06ea5d990d39979ff227588e479ee9dde1d69c88 You're receiving this email because of your account on salsa.debian.org.
