Control: tags 1136087 + patch Control: tags 1136087 + pending Dear maintainer,
I've prepared an NMU for zeroinstall-injector (versioned as 2.18-2.3) and uploaded it to DELAYED/5. Please feel free to tell me if I should cancel it. Regards. diffstat for zeroinstall-injector-2.18 zeroinstall-injector-2.18 changelog | 8 +++++ control | 1 patches/0002-Fix-build-with-lwt-6.patch | 44 ++++++++++++++++++++++++++++++++ patches/series | 1 4 files changed, 53 insertions(+), 1 deletion(-) diff -Nru zeroinstall-injector-2.18/debian/changelog zeroinstall-injector-2.18/debian/changelog --- zeroinstall-injector-2.18/debian/changelog 2026-01-17 01:05:34.000000000 +0100 +++ zeroinstall-injector-2.18/debian/changelog 2026-05-09 17:28:12.000000000 +0200 @@ -1,3 +1,11 @@ +zeroinstall-injector (2.18-2.3) unstable; urgency=medium + + * Non-maintainer upload + * Remove liblwt-log-ocaml-dev from Build-Depends + * Fix build with lwt 6 (Closes: #1136087) + + -- Stéphane Glondu <[email protected]> Sat, 09 May 2026 17:28:12 +0200 + zeroinstall-injector (2.18-2.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru zeroinstall-injector-2.18/debian/control zeroinstall-injector-2.18/debian/control --- zeroinstall-injector-2.18/debian/control 2026-01-17 01:05:34.000000000 +0100 +++ zeroinstall-injector-2.18/debian/control 2026-05-09 17:28:12.000000000 +0200 @@ -15,7 +15,6 @@ libxmlm-ocaml-dev, libyojson-ocaml-dev, libppxlib-ocaml-dev, - liblwt-log-ocaml-dev, ocaml-dune, ocaml-findlib, ocaml, diff -Nru zeroinstall-injector-2.18/debian/patches/0002-Fix-build-with-lwt-6.patch zeroinstall-injector-2.18/debian/patches/0002-Fix-build-with-lwt-6.patch --- zeroinstall-injector-2.18/debian/patches/0002-Fix-build-with-lwt-6.patch 1970-01-01 01:00:00.000000000 +0100 +++ zeroinstall-injector-2.18/debian/patches/0002-Fix-build-with-lwt-6.patch 2026-05-09 17:28:12.000000000 +0200 @@ -0,0 +1,44 @@ +From: =?utf-8?q?St=C3=A9phane_Glondu?= <[email protected]> +Date: Sat, 9 May 2026 17:00:14 +0200 +Subject: Fix build with lwt 6 + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1136087 +--- + vendor/lwt_glib-1.1.1/src/lwt_glib.ml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/vendor/lwt_glib-1.1.1/src/lwt_glib.ml b/vendor/lwt_glib-1.1.1/src/lwt_glib.ml +index 7ff5d10..3ac1f9e 100644 +--- a/vendor/lwt_glib-1.1.1/src/lwt_glib.ml ++++ b/vendor/lwt_glib-1.1.1/src/lwt_glib.ml +@@ -33,7 +33,7 @@ external glib_stop : unit -> unit = "lwt_glib_stop" + + type state = + | State_none +- | State_glib_into_lwt of (unit -> unit) Lwt_sequence.node * (unit -> unit) Lwt_sequence.node ++ | State_glib_into_lwt of Lwt_main.Enter_iter_hooks.hook * Lwt_main.Leave_iter_hooks.hook + | State_lwt_into_glib of Lwt_engine.t + + let state = ref State_none +@@ -117,8 +117,8 @@ let install ?(mode=`lwt_into_glib) () = + glib_init (); + match mode with + | `glib_into_lwt -> +- state := State_glib_into_lwt(Lwt_sequence.add_l enter Lwt_main.enter_iter_hooks, +- Lwt_sequence.add_l leave Lwt_main.leave_iter_hooks) ++ state := State_glib_into_lwt(Lwt_main.Enter_iter_hooks.add_first enter, ++ Lwt_main.Leave_iter_hooks.add_first leave) + [@ocaml.warning "-3"] + | `lwt_into_glib -> + let engine = Lwt_engine.get () in +@@ -131,8 +131,8 @@ let remove () = + () + | State_glib_into_lwt(node_enter, node_leave) -> + state := State_none; +- Lwt_sequence.remove node_enter; +- Lwt_sequence.remove node_leave; ++ Lwt_main.Enter_iter_hooks.remove node_enter; ++ Lwt_main.Leave_iter_hooks.remove node_leave; + List.iter Lwt_engine.stop_event !events; + events := []; + glib_stop () diff -Nru zeroinstall-injector-2.18/debian/patches/series zeroinstall-injector-2.18/debian/patches/series --- zeroinstall-injector-2.18/debian/patches/series 2026-01-17 01:05:34.000000000 +0100 +++ zeroinstall-injector-2.18/debian/patches/series 2026-05-09 17:28:12.000000000 +0200 @@ -1 +1,2 @@ bytecode.patch +0002-Fix-build-with-lwt-6.patch
