[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/ocamlnet][master] 4 commits: Fix compilation with OCaml 5.04.0

Title: GitLab

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:

Changes:

  • debian/changelog
    1 
    +ocamlnet (4.1.9-7) unstable; urgency=medium
    2 
    +
    3 
    +  * Fix compilation with OCaml 5.4.0
    4 
    +  * Bump Standards-Version to 4.7.2
    5 
    +  * Remove Rules-Requires-Root
    6 
    +
    7 
    + -- Stéphane Glondu <glondu@debian.org>  Thu, 18 Dec 2025 07:36:44 +0100
    8 
    +
    1 9 
     ocamlnet (4.1.9-6) unstable; urgency=medium
    2 10
    3 11 
       * Fix build with OCaml 5.x

  • debian/control
    ... ... @@ -16,8 +16,7 @@ Build-Depends:
    16 16 
      pkg-config,
    17 17 
      libgnutls28-dev,
    18 18 
      apache2-dev
    19 
    -Standards-Version: 4.6.2
    20 
    -Rules-Requires-Root: no
    19 
    +Standards-Version: 4.7.2
    21 20 
     Homepage: http://projects.camlcity.org/projects/ocamlnet.html
    22 21 
     Vcs-Git: https://salsa.debian.org/ocaml-team/ocamlnet.git
    23 22 
     Vcs-Browser: https://salsa.debian.org/ocaml-team/ocamlnet

  • debian/patches/0012-Fix-compilation-with-OCaml-5.04.0.patch
    1 
    +From: Stephane Glondu <steph@glondu.net>
    2 
    +Date: Thu, 18 Dec 2025 07:30:56 +0100
    3 
    +Subject: Fix compilation with OCaml 5.04.0
    4 
    +
    5 
    +---
    6 
    + src/netsys/netsys_c.h | 2 ++
    7 
    + 1 file changed, 2 insertions(+)
    8 
    +
    9 
    +diff --git a/src/netsys/netsys_c.h b/src/netsys/netsys_c.h
    10 
    +index a98aa74..ee1513c 100644
    11 
    +--- a/src/netsys/netsys_c.h
    12 
    ++++ b/src/netsys/netsys_c.h
    13 
    +@@ -215,7 +215,9 @@ union sock_addr_union {
    14 
    + /* bigarrays                                                          */
    15 
    + /**********************************************************************/
    16 
    +
    17 
    ++#if !defined(OCAML_VERSION) || OCAML_VERSION < 50400
    18 
    + extern int caml_ba_element_size[];
    19 
    ++#endif
    20 
    +
    21 
    +
    22 
    + #endif

  • debian/patches/series
    ... ... @@ -9,3 +9,4 @@
    9 9 
     0009-Import-upstream-merge-request-24-to-add-OCaml-5.x-su.patch
    10 10 
     0010-More-OCaml-5.x-fixes.patch
    11 11 
     0011-Fix-build-with-OCaml-5.2.0.patch
    12 
    +0012-Fix-compilation-with-OCaml-5.04.0.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help Notification message regarding https://salsa.debian.org/ocaml-team/ocamlnet/-/compare/2b4e793c0c08afd6cb64b68ae8b113ae273750b2...babda32d92c757f383dd372af847b759c92fa3ee at 1766040040

    Reply to: