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: - CHANGELOG.md - debian/changelog - debian/control - src/api/ppx_deriving.cppo.ml Changes: ===================================== CHANGELOG.md ===================================== @@ -1,3 +1,10 @@ +6.0.3 +----- + +* Add OCaml 5.3 support + #288 + (@kit-ty-kate) + 6.0.2 ----- ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +ppx-deriving (6.0.3-1) unstable; urgency=medium + + * New upstream release + * Bump Standards-Version to 4.7.0 + + -- Stéphane Glondu <[email protected]> Fri, 11 Oct 2024 11:54:40 +0200 + ppx-deriving (6.0.2-2) unstable; urgency=medium * Update test for new show returned value (Closes: #1072672) ===================================== debian/control ===================================== @@ -16,7 +16,7 @@ Build-Depends: libounit-ocaml-dev <!nocheck>, libppx-derivers-ocaml-dev, dh-ocaml (>= 1.2) -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/ocaml-team/ppx-deriving 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 = #if OCAML_VERSION >= (4, 08, 0) let sub = let msg_of_error err = +#if OCAML_VERSION >= (5, 3, 0) + let loc = err.Location.main.loc in + let print_report fmt x = + Ocaml_common.Format_doc.deprecated_printer + (fun fmt -> Location.print_report fmt x) fmt + in + Location.msg ~loc "%a" print_report err +#else { txt = (fun fmt -> Location.print_report fmt err); - loc = err.Location.main.loc } in + loc = err.Location.main.loc } +#endif + in Option.map (List.map msg_of_error) sub in #endif let err = Location.error ?sub ?loc str in View it on GitLab: https://salsa.debian.org/ocaml-team/ppx-deriving/-/compare/6ee8c87fc0752a6c59f70fc78f645eb969152027...a5744a8f423c7c52418042bfd924a547c11267e7 -- View it on GitLab: https://salsa.debian.org/ocaml-team/ppx-deriving/-/compare/6ee8c87fc0752a6c59f70fc78f645eb969152027...a5744a8f423c7c52418042bfd924a547c11267e7 You're receiving this email because of your account on salsa.debian.org.
