Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocamlnet
Commits: 32bcaa0e by Stephane Glondu at 2025-12-18T07:31:10+01:00 Fix compilation with OCaml 5.04.0 - - - - - 05ca5817 by Stephane Glondu at 2025-12-18T07:31:36+01:00 Update packaging - - - - - a3322c21 by Stephane Glondu at 2025-12-18T07:32:08+01:00 Update changelog - - - - - babda32d by Stephane Glondu at 2025-12-18T07:36:48+01:00 Prepare upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0012-Fix-compilation-with-OCaml-5.04.0.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +ocamlnet (4.1.9-7) unstable; urgency=medium + + * Fix compilation with OCaml 5.4.0 + * Bump Standards-Version to 4.7.2 + * Remove Rules-Requires-Root + + -- Stéphane Glondu <[email protected]> Thu, 18 Dec 2025 07:36:44 +0100 + ocamlnet (4.1.9-6) unstable; urgency=medium * Fix build with OCaml 5.x ===================================== debian/control ===================================== @@ -16,8 +16,7 @@ Build-Depends: pkg-config, libgnutls28-dev, apache2-dev -Standards-Version: 4.6.2 -Rules-Requires-Root: no +Standards-Version: 4.7.2 Homepage: http://projects.camlcity.org/projects/ocamlnet.html Vcs-Git: https://salsa.debian.org/ocaml-team/ocamlnet.git Vcs-Browser: https://salsa.debian.org/ocaml-team/ocamlnet ===================================== debian/patches/0012-Fix-compilation-with-OCaml-5.04.0.patch ===================================== @@ -0,0 +1,22 @@ +From: Stephane Glondu <[email protected]> +Date: Thu, 18 Dec 2025 07:30:56 +0100 +Subject: Fix compilation with OCaml 5.04.0 + +--- + src/netsys/netsys_c.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/netsys/netsys_c.h b/src/netsys/netsys_c.h +index a98aa74..ee1513c 100644 +--- a/src/netsys/netsys_c.h ++++ b/src/netsys/netsys_c.h +@@ -215,7 +215,9 @@ union sock_addr_union { + /* bigarrays */ + /**********************************************************************/ + ++#if !defined(OCAML_VERSION) || OCAML_VERSION < 50400 + extern int caml_ba_element_size[]; ++#endif + + + #endif ===================================== debian/patches/series ===================================== @@ -9,3 +9,4 @@ 0009-Import-upstream-merge-request-24-to-add-OCaml-5.x-su.patch 0010-More-OCaml-5.x-fixes.patch 0011-Fix-build-with-OCaml-5.2.0.patch +0012-Fix-compilation-with-OCaml-5.04.0.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ocamlnet/-/compare/2b4e793c0c08afd6cb64b68ae8b113ae273750b2...babda32d92c757f383dd372af847b759c92fa3ee -- View it on GitLab: https://salsa.debian.org/ocaml-team/ocamlnet/-/compare/2b4e793c0c08afd6cb64b68ae8b113ae273750b2...babda32d92c757f383dd372af847b759c92fa3ee You're receiving this email because of your account on salsa.debian.org.
