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

[Git][ocaml-team/ppx-deriving][master] 5 commits: New upstream version 6.0.3



Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ppx-deriving

Commits:

  • 03fac136
    by Stephane Glondu at 2024-10-11T11:51:20+02:00
    New upstream version 6.0.3
  • d8605a53
    by Stephane Glondu at 2024-10-11T11:51:20+02:00
    Update upstream source from tag 'upstream/6.0.3'
    
    Update to upstream version '6.0.3'
    with Debian dir 54876d333c482ae385a1dd71eeda23caaf3b014d
  • 6b4ecbdb
    by Stephane Glondu at 2024-10-11T11:51:25+02:00
    New upstream release
    
  • 59f4c616
    by Stephane Glondu at 2024-10-11T11:54:30+02:00
    Bump Standards-Version to 4.7.0
    
  • a5744a8f
    by Stephane Glondu at 2024-10-11T11:54:44+02:00
    Update changelog and prepare upload to unstable
    

4 changed files:

Changes:

  • CHANGELOG.md
    1
    +6.0.3
    
    2
    +-----
    
    3
    +
    
    4
    +* Add OCaml 5.3 support
    
    5
    +  #288
    
    6
    +  (@kit-ty-kate)
    
    7
    +
    
    1 8
     6.0.2
    
    2 9
     -----
    
    3 10
     
    

  • debian/changelog
    1
    +ppx-deriving (6.0.3-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * New upstream release
    
    4
    +  * Bump Standards-Version to 4.7.0
    
    5
    +
    
    6
    + -- Stéphane Glondu <glondu@debian.org>  Fri, 11 Oct 2024 11:54:40 +0200
    
    7
    +
    
    1 8
     ppx-deriving (6.0.2-2) unstable; urgency=medium
    
    2 9
     
    
    3 10
       * Update test for new show returned value (Closes: #1072672)
    

  • debian/control
    ... ... @@ -16,7 +16,7 @@ Build-Depends:
    16 16
      libounit-ocaml-dev <!nocheck>,
    
    17 17
      libppx-derivers-ocaml-dev,
    
    18 18
      dh-ocaml (>= 1.2)
    
    19
    -Standards-Version: 4.6.2
    
    19
    +Standards-Version: 4.7.0
    
    20 20
     Rules-Requires-Root: no
    
    21 21
     Vcs-Browser: https://salsa.debian.org/ocaml-team/ppx-deriving
    
    22 22
     Vcs-Git: https://salsa.debian.org/ocaml-team/ppx-deriving.git
    

  • src/api/ppx_deriving.cppo.ml
    ... ... @@ -174,8 +174,18 @@ let raise_errorf ?sub ?loc fmt =
    174 174
     #if OCAML_VERSION >= (4, 08, 0)
    
    175 175
         let sub =
    
    176 176
           let msg_of_error err =
    
    177
    +#if OCAML_VERSION >= (5, 3, 0)
    
    178
    +        let loc = err.Location.main.loc in
    
    179
    +        let print_report fmt x =
    
    180
    +          Ocaml_common.Format_doc.deprecated_printer
    
    181
    +            (fun fmt -> Location.print_report fmt x) fmt
    
    182
    +        in
    
    183
    +        Location.msg ~loc "%a" print_report err
    
    184
    +#else
    
    177 185
             { txt = (fun fmt -> Location.print_report fmt err);
    
    178
    -          loc = err.Location.main.loc } in
    
    186
    +          loc = err.Location.main.loc }
    
    187
    +#endif
    
    188
    +      in
    
    179 189
           Option.map (List.map msg_of_error) sub in
    
    180 190
     #endif
    
    181 191
         let err = Location.error ?sub ?loc str in
    


  • Reply to: