Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-uutf for openSUSE:Factory checked in at 2022-04-06 21:51:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-uutf (Old) and /work/SRC/openSUSE:Factory/.ocaml-uutf.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-uutf" Wed Apr 6 21:51:30 2022 rev:4 rq:967084 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-uutf/ocaml-uutf.changes 2021-04-29 01:37:19.550487053 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-uutf.new.1900/ocaml-uutf.changes 2022-04-06 21:51:52.651302796 +0200 @@ -1,0 +2,6 @@ +Mon Apr 4 04:04:04 UTC 2022 - [email protected] + +- Update to version 1.0.3 + See included CHANGES.md for details + +------------------------------------------------------------------- Old: ---- ocaml-uutf-1.0.2.tar.xz New: ---- ocaml-uutf-1.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-uutf.spec ++++++ --- /var/tmp/diff_new_pack.8gBGF9/_old 2022-04-06 21:51:53.083297867 +0200 +++ /var/tmp/diff_new_pack.8gBGF9/_new 2022-04-06 21:51:53.091297775 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-uutf # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,18 @@ Name: ocaml-uutf -Version: 1.0.2 +Version: 1.0.3 Release: 0 %{?ocaml_preserve_bytecode} Summary: Non-blocking streaming Unicode codec for OCaml License: ISC Group: Development/Languages/OCaml URL: http://erratique.ch/software/uutf -Source0: %{name}-%{version}.tar.xz +Source0: %name-%version.tar.xz Patch0: ocaml-uutf.patch BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20210121 +BuildRequires: ocaml-rpm-macros >= 20220222 %description Uutf is a non-blocking streaming codec to decode and encode the UTF-8, @@ -41,13 +41,13 @@ Buffer.t values. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Languages/OCaml -Requires: %{name} = %{version}-%{release} +Requires: %name = %version-%release %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The %name-devel package contains libraries and signature files for +developing applications that use %name. %prep %autosetup -p1 @@ -64,8 +64,8 @@ %check %ocaml_dune_test -%files -f %{name}.files +%files -f %name.files -%files devel -f %{name}.files.devel +%files devel -f %name.files.devel %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.8gBGF9/_old 2022-04-06 21:51:53.119297456 +0200 +++ /var/tmp/diff_new_pack.8gBGF9/_new 2022-04-06 21:51:53.123297410 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-uutf</param> - <param name="revision">d43c88c0673b0d30dc34960645d0f992d68b23a1</param> + <param name="revision">0536faa28e46a12142954575d95d8d0b86a96f30</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/dbuenzli/uutf.git</param> ++++++ ocaml-uutf-1.0.2.tar.xz -> ocaml-uutf-1.0.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/.gitignore new/ocaml-uutf-1.0.3/.gitignore --- old/ocaml-uutf-1.0.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-uutf-1.0.3/.gitignore 2022-02-03 20:44:22.000000000 +0100 @@ -0,0 +1,4 @@ +_b0 +_build +tmp +*.install \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/.merlin new/ocaml-uutf-1.0.3/.merlin --- old/ocaml-uutf-1.0.2/.merlin 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/.merlin 2022-02-03 20:44:22.000000000 +0100 @@ -1,4 +1,4 @@ -PKG cmdliner uchar bytes +PKG b0.kit cmdliner S src S test B _build/** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/B0.ml new/ocaml-uutf-1.0.3/B0.ml --- old/ocaml-uutf-1.0.2/B0.ml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-uutf-1.0.3/B0.ml 2022-02-03 20:44:22.000000000 +0100 @@ -0,0 +1,62 @@ +open B0_kit.V000 +open B00_std + + +(* OCaml library names *) + +let uutf = B0_ocaml.libname "uutf" +let unix = B0_ocaml.libname "unix" +let cmdliner = B0_ocaml.libname "cmdliner" + +(* Libraries *) + +let uutf_lib = + let srcs = Fpath.[`Dir (v "src")] in + let requires = [] in + B0_ocaml.lib uutf ~doc:"The uutf library" ~srcs ~requires + +(* Tests *) + +let test = + let srcs = Fpath.[`File (v "test/test.ml")] in + let meta = B0_meta.(empty |> tag test) in + let requires = [ uutf ] in + B0_ocaml.exe "test" ~doc:"Test suite" ~srcs ~meta ~requires + +let utftrip = + let doc = "Recode UTF-{8,16,16LE,16BE} and latin1 from stdin to stdout" in + let srcs = Fpath.[`File (v "test/utftrip.ml")] in + let requires = [unix; uutf; cmdliner] in + B0_ocaml.exe "utftrip" ~doc ~srcs ~requires + +(* Packs *) + +let default = + let meta = + let open B0_meta in + empty + |> tag B0_opam.tag + |> add authors ["The uutf programmers"] + |> add maintainers ["Daniel B??nzli <daniel.buenzl [email protected]>"] + |> add homepage "https://erratique.ch/software/uutf"; + |> add online_doc "https://erratique.ch/software/uutf/doc/"; + |> add licenses ["ISC"] + |> add repo "git+https://erratique.ch/repos/uutf.git"; + |> add issues "https://github.com/dbuenzli/uutf/issues"; + |> add description_tags + ["unicode"; "text"; "utf-8"; "utf-16"; "codec"; "org:erratique"] + |> add B0_opam.Meta.depopts ["cmdliner", ""] + |> add B0_opam.Meta.conflicts + [ "cmdliner", {|< "0.9.8"|}] + |> add B0_opam.Meta.depends + [ "ocaml", {|>= "4.03.0"|}; + "ocamlfind", {|build|}; + "ocamlbuild", {|build|}; + "topkg", {|build & >= "1.0.3"|}; + ] + |> add B0_opam.Meta.build + {|[["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%" + "--with-cmdliner" "%{cmdliner:installed}%"]]|} + in + B0_pack.v "default" ~doc:"uutf package" ~meta ~locked:true @@ + B0_unit.list () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/BRZO new/ocaml-uutf-1.0.3/BRZO --- old/ocaml-uutf-1.0.2/BRZO 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-uutf-1.0.3/BRZO 2022-02-03 20:44:22.000000000 +0100 @@ -0,0 +1 @@ +(srcs-x pkg) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/CHANGES.md new/ocaml-uutf-1.0.3/CHANGES.md --- old/ocaml-uutf-1.0.2/CHANGES.md 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/CHANGES.md 2022-02-03 20:44:22.000000000 +0100 @@ -1,3 +1,9 @@ +v1.0.3 2022-02-03 +----------------- + +- Support for OCaml 5.00, thanks to Kate (@kit-ty-kate) for + the patch. + v1.0.2 2019-02-05 La Forclaz (VS) --------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/LICENSE.md new/ocaml-uutf-1.0.3/LICENSE.md --- old/ocaml-uutf-1.0.2/LICENSE.md 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/LICENSE.md 2022-02-03 20:44:22.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright (c) 2016 Daniel C. B??nzli +Copyright (c) 2016 The uutf programmers Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/README.md new/ocaml-uutf-1.0.3/README.md --- old/ocaml-uutf-1.0.2/README.md 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/README.md 2022-02-03 20:44:22.000000000 +0100 @@ -9,7 +9,8 @@ Functions are also provided to fold over the characters of UTF encoded OCaml string values and to directly encode characters in OCaml -Buffer.t values. +Buffer.t values. **Note** that since OCaml 4.14, that functionality +can be found in the Stdlib and you are encouraged to migrate to it. Uutf has no dependency and is distributed under the ISC license. @@ -33,7 +34,7 @@ the source interfaces. It can be consulted [online][doc] or via `odig doc uutf`. -[doc]: http://erratique.ch/software/uutf/doc/Uutf +[doc]: http://erratique.ch/software/uutf/doc/ ## Sample programs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/_tags new/ocaml-uutf-1.0.3/_tags --- old/ocaml-uutf-1.0.2/_tags 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/_tags 2022-02-03 20:44:22.000000000 +0100 @@ -1,7 +1,7 @@ -true : bin_annot, safe_string, package(bytes), package(uchar) +true : bin_annot, safe_string +<_b0> : -traverse <src> : include - <test> : include <test/utftrip.*> : package(unix), package(cmdliner) <test/examples.*> : package(unix) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/doc/api.odocl new/ocaml-uutf-1.0.3/doc/api.odocl --- old/ocaml-uutf-1.0.2/doc/api.odocl 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/doc/api.odocl 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Uutf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/doc/index.mld new/ocaml-uutf-1.0.3/doc/index.mld --- old/ocaml-uutf-1.0.2/doc/index.mld 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-uutf-1.0.3/doc/index.mld 2022-02-03 20:44:22.000000000 +0100 @@ -0,0 +1,17 @@ +{0 Uutf {%html: <span class="version">%%VERSION%%</span>%}} + +Uutf is a non-blocking streaming codec to decode and encode the UTF-8, +UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently +work character by character without blocking on IO. Decoders perform +character position tracking and support newline normalization. + +Functions are also provided to fold over the characters of UTF encoded +OCaml string values and to directly encode characters in OCaml +{!Buffer.t} values. {b Note} that since OCaml 4.14, that functionality +can be found in the Stdlib and you are encouraged to migrate to it. + +{1:api API} + +{!modules: +Uutf +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/opam new/ocaml-uutf-1.0.3/opam --- old/ocaml-uutf-1.0.2/opam 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/opam 2022-02-03 20:44:22.000000000 +0100 @@ -1,22 +1,34 @@ opam-version: "2.0" -maintainer: "Daniel B??nzli <daniel.buenzl [email protected]>" -authors: ["Daniel B??nzli <daniel.buenzl [email protected]>"] -homepage: "http://erratique.ch/software/uutf"; -doc: "http://erratique.ch/software/uutf/doc/Uutf"; -dev-repo: "git+http://erratique.ch/repos/uutf.git"; +name: "uutf" +synopsis: """Non-blocking streaming Unicode codec for OCaml""" +maintainer: ["Daniel B??nzli <daniel.buenzl [email protected]>"] +authors: ["The uutf programmers"] +homepage: "https://erratique.ch/software/uutf"; +doc: "https://erratique.ch/software/uutf/doc/"; +dev-repo: "git+https://erratique.ch/repos/uutf.git"; bug-reports: "https://github.com/dbuenzli/uutf/issues"; -tags: [ "unicode" "text" "utf-8" "utf-16" "codec" "org:erratique" ] -license: "ISC" -depends: [ - "ocaml" {>= "4.01.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build} - "uchar" -] +license: ["ISC"] +tags: ["unicode" "text" "utf-8" "utf-16" "codec" "org:erratique"] +depends: ["ocaml" {>= "4.03.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build & >= "1.0.3"}] depopts: ["cmdliner"] -conflicts: ["cmdliner" { < "0.9.6"} ] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" - "--with-cmdliner" "%{cmdliner:installed}%" ]] \ No newline at end of file +conflicts: ["cmdliner" {< "0.9.8"}] +build: [["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%" + "--with-cmdliner" "%{cmdliner:installed}%"]] +description: """ +Uutf is a non-blocking streaming codec to decode and encode the UTF-8, +UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently +work character by character without blocking on IO. Decoders perform +character position tracking and support newline normalization. + +Functions are also provided to fold over the characters of UTF encoded +OCaml string values and to directly encode characters in OCaml +Buffer.t values. **Note** that since OCaml 4.14, that functionality +can be found in the Stdlib and you are encouraged to migrate to. + +Uutf has no dependency and is distributed under the ISC license. + +Home page: http://erratique.ch/software/uutf +Contact: Daniel B??nzli `<daniel.buenzl [email protected]>`""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/pkg/META new/ocaml-uutf-1.0.3/pkg/META --- old/ocaml-uutf-1.0.2/pkg/META 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/pkg/META 2022-02-03 20:44:22.000000000 +0100 @@ -1,6 +1,6 @@ version = "%%VERSION_NUM%%" description = "Non-blocking streaming Unicode codec for OCaml" -requires = "bytes uchar" +requires = "" archive(byte) = "uutf.cma" archive(native) = "uutf.cmxa" plugin(byte) = "uutf.cma" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/src/uutf.ml new/ocaml-uutf-1.0.3/src/uutf.ml --- old/ocaml-uutf-1.0.2/src/uutf.ml 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/src/uutf.ml 2022-02-03 20:44:22.000000000 +0100 @@ -1,7 +1,6 @@ (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli. All rights reserved. + Copyright (c) 2012 The uutf programmers. All rights reserved. Distributed under the ISC license, see terms at the end of the file. - %%NAME%% %%VERSION%% ---------------------------------------------------------------------------*) let io_buffer_size = 65536 (* IO_BUFFER_SIZE 4.0.0 *) @@ -31,7 +30,7 @@ type encoding = [ `UTF_8 | `UTF_16 | `UTF_16BE | `UTF_16LE ] type decoder_encoding = [ encoding | `US_ASCII | `ISO_8859_1 ] -let encoding_of_string s = match String.uppercase s with (* IANA names. *) +let encoding_of_string s = match String.uppercase_ascii s with (* IANA names. *) | "UTF-8" -> Some `UTF_8 | "UTF-16" -> Some `UTF_16 | "UTF-16LE" -> Some `UTF_16LE @@ -807,7 +806,7 @@ end (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli + Copyright (c) 2012 The uutf programmers Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/src/uutf.mli new/ocaml-uutf-1.0.3/src/uutf.mli --- old/ocaml-uutf-1.0.2/src/uutf.mli 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/src/uutf.mli 2022-02-03 20:44:22.000000000 +0100 @@ -1,7 +1,6 @@ (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli. All rights reserved. + Copyright (c) 2012 The uutf programmers. All rights reserved. Distributed under the ISC license, see terms at the end of the file. - %%NAME%% %%VERSION%% ---------------------------------------------------------------------------*) (** Non-blocking streaming Unicode codec. @@ -13,32 +12,34 @@ character without blocking on IO. Decoders perform character position tracking and support {{!nln}newline normalization}. - Functions are also provided to {{!String} fold over} the - characters of UTF encoded OCaml string values and to - {{!Buffer}directly encode} characters in OCaml {!Buffer.t} - values. + Functions are also provided to {{!String} fold over} the characters + of UTF encoded OCaml string values and to {{!Buffer}directly encode} + characters in OCaml {!Stdlib.Buffer.t} values. {b Note} that since OCaml + 4.14, that functionality can be found in {!Stdlib.String} and + {!Stdlib.Buffer} and you are encouraged to migrate to it. See {{:#examples}examples} of use. - {e %%VERSION%% ??? {{:%%PKG_HOMEPAGE%% }homepage}} - - {3 References} - {ul - {- The Unicode Consortium. - {e {{:http://www.unicode.org/versions/latest}The Unicode Standard}}. - (latest version)}} + {b References} + {ul + {- The Unicode Consortium. + {e {{:http://www.unicode.org/versions/latest}The Unicode Standard}}. + (latest version)}} *) (** {1:ucharcsts Special Unicode characters} *) val u_bom : Uchar.t (** [u_bom] is the {{:http://unicode.org/glossary/#byte_order_mark}byte - order mark} (BOM) character ([U+FEFF]). *) + order mark} (BOM) character ([U+FEFF]). From OCaml 4.06 on, use + {!Uchar.bom}. *) val u_rep : Uchar.t (** [u_rep] is the {{:http://unicode.org/glossary/#replacement_character}replacement} - character ([U+FFFD]). *) + character ([U+FFFD]). From OCaml 4.06 on, use + {!Uchar.rep}. *) + (** {1:schemes Unicode encoding schemes} *) @@ -121,7 +122,7 @@ can only be [`UTF_8], [`UTF_16BE] or [`UTF_16LE]. The heuristic looks at the first three bytes of input (or less if impossible) and takes the {e first} matching byte pattern in the table below. -{[ +{v xx = any byte .. = any byte or no byte (input too small) pp = positive byte @@ -137,7 +138,7 @@ uu .. .. | `UTF_8 | ASCII UTF-8 or valid UTF-8 first byte. xx xx .. | `UTF_16BE | Not UTF-8 => UTF-16, no BOM => UTF-16BE .. .. .. | `UTF_8 | Single malformed UTF-8 byte or no input. -]} +v} This heuristic is compatible both with BOM based recognitition and {{:http://tools.ietf.org/html/rfc4627#section-3}JSON-like encoding @@ -153,12 +154,12 @@ and character count of the last decoded character (including [`Malformed] ones) are respectively returned by {!decoder_line}, {!decoder_col}, {!decoder_byte_count} and {!decoder_count}. Before - the first call to {!decode} the line number is [1] and the column - is [0]. Each {!decode} returning [`Uchar] or [`Malformed] + the first call to {!val-decode} the line number is [1] and the column + is [0]. Each {!val-decode} returning [`Uchar] or [`Malformed] increments the column until a newline. On a newline, the line number is incremented and the column set to zero. For example the line is [2] and column [0] after the first newline was - decoded. This can be understood as if {!decode} was moving an + decoded. This can be understood as if {!val-decode} was moving an insertion point to the right in the data. A {e newline} is anything normalized by [`Readline], see {!nln}. @@ -205,7 +206,7 @@ (** [set_decoder_encoding d enc] changes the decoded encoding to [enc] after decoding started. - {b Warning.} Call only after {!decode} was called on [d] and that the + {b Warning.} Call only after {!val-decode} was called on [d] and that the last call to it returned something different from [`Await] or data may be lost. After encoding guess wait for at least three [`Uchar]s. *) @@ -213,25 +214,25 @@ val decoder_line : decoder -> int (** [decoder_line d] is the line number of the last - decoded (or malformed) character. See {!decoder} for details. *) + decoded (or malformed) character. See {!val-decoder} for details. *) val decoder_col : decoder -> int (** [decoder_col d] is the column number of the last decoded - (or malformed) character. See {!decoder} for details. *) + (or malformed) character. See {!val-decoder} for details. *) val decoder_byte_count : decoder -> int (** [decoder_byte_count d] is the number of bytes already decoded on - [d] (including malformed ones). This is the last {!decode}'s + [d] (including malformed ones). This is the last {!val-decode}'s end byte offset counting from the beginning of the stream. *) val decoder_count : decoder -> int (** [decoder_count d] is the number of characters already decoded on [d] - (including malformed ones). See {!decoder} for details. *) + (including malformed ones). See {!val-decoder} for details. *) val decoder_removed_bom : decoder -> bool (** [decoder_removed_bom d] is [true] iff an {e initial} {{:http://unicode.org/glossary/#byte_order_mark}BOM} was - removed from the input stream. See {!decoder} for details. *) + removed from the input stream. See {!val-decoder} for details. *) val decoder_src : decoder -> src (** [decoder_src d] is [d]'s input source. *) @@ -267,7 +268,7 @@ {ul {- [`Partial] iff [e] has a [`Manual] destination and needs more output storage. The client must use {!Manual.dst} to provide a new buffer - and then call {!encode} with [`Await] until [`Ok] is returned.} + and then call {!val-encode} with [`Await] until [`Ok] is returned.} {- [`Ok] when the encoder is ready to encode a new [`Uchar] or [`End]}} For [`Manual] destination, encoding [`End] always returns @@ -293,15 +294,15 @@ module Manual : sig val src : decoder -> Bytes.t -> int -> int -> unit (** [src d s j l] provides [d] with [l] bytes to read, starting at - [j] in [s]. This byte range is read by calls to {!decode} with [d] + [j] in [s]. This byte range is read by calls to {!val-decode} with [d] until [`Await] is returned. To signal the end of input call the function with [l = 0]. *) val dst : encoder -> Bytes.t -> int -> int -> unit (** [dst e s j l] provides [e] with [l] bytes to write, starting - at [j] in [s]. This byte range is written by calls to {!encode} with [e] - until [`Partial] is returned. Use {!dst_rem} to know the remaining - number of non-written free bytes in [s]. *) + at [j] in [s]. This byte range is written by calls to + {!val-encode} with [e] until [`Partial] is returned. Use {!dst_rem} to + know the remaining number of non-written free bytes in [s]. *) val dst_rem : encoder -> int (** [dst_rem e] is the remaining number of non-written, free bytes @@ -310,7 +311,10 @@ (** {1:strbuf String folders and Buffer encoders} *) -(** Fold over the characters of UTF encoded OCaml [string] values. *) +(** Fold over the characters of UTF encoded OCaml [string] values. + + {b Note.} Since OCaml 4.14, UTF decoders are available in + {!Stdlib.String}. You are encouraged to migrate to them. *) module String : sig (** {1 Encoding guess} *) @@ -358,7 +362,10 @@ [String.length s - pos]. *) end -(** UTF encode characters in OCaml {!Buffer.t} values. *) +(** UTF encode characters in OCaml {!Buffer.t} values. + + {b Note.} Since OCaml 4.06, these encoders are available in + {!Stdlib.Buffer}. You are encouraged to migrate to them. *) module Buffer : sig (** {1 Buffer encoders} *) @@ -487,7 +494,7 @@ *) (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli + Copyright (c) 2012 The uutf programmers Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/test/test.ml new/ocaml-uutf-1.0.3/test/test.ml --- old/ocaml-uutf-1.0.2/test/test.ml 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/test/test.ml 2022-02-03 20:44:22.000000000 +0100 @@ -1,7 +1,6 @@ (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli. All rights reserved. + Copyright (c) 2012 The uutf programmers. All rights reserved. Distributed under the ISC license, see terms at the end of the file. - %%NAME%% %%VERSION%% ---------------------------------------------------------------------------*) let u_nl = Uchar.of_int 0x000A @@ -377,7 +376,7 @@ let () = if not (!Sys.interactive) then test () (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli + Copyright (c) 2012 The uutf programmers Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/test/tests.itarget new/ocaml-uutf-1.0.3/test/tests.itarget --- old/ocaml-uutf-1.0.2/test/tests.itarget 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/test/tests.itarget 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -test.native -examples.native -utftrip.native \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-uutf-1.0.2/test/utftrip.ml new/ocaml-uutf-1.0.3/test/utftrip.ml --- old/ocaml-uutf-1.0.2/test/utftrip.ml 2019-02-05 21:29:14.000000000 +0100 +++ new/ocaml-uutf-1.0.3/test/utftrip.ml 2022-02-03 20:44:22.000000000 +0100 @@ -1,7 +1,6 @@ (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli. All rights reserved. + Copyright (c) 2012 The uutf programmers. All rights reserved. Distributed under the ISC license, see terms at the end of the file. - %%NAME%% %%VERSION%% ---------------------------------------------------------------------------*) let str = Printf.sprintf @@ -392,7 +391,7 @@ | _ -> if !input_malformed then exit 2 else exit 0 (*--------------------------------------------------------------------------- - Copyright (c) 2012 Daniel C. B??nzli + Copyright (c) 2012 The uutf programmers Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above ++++++ ocaml-uutf.patch ++++++ --- /var/tmp/diff_new_pack.8gBGF9/_old 2022-04-06 21:51:53.183296725 +0200 +++ /var/tmp/diff_new_pack.8gBGF9/_new 2022-04-06 21:51:53.183296725 +0200 @@ -3,32 +3,6 @@ @@ -0,0 +1,2 @@ +(lang dune 1.0) +(name uutf) ---- a/opam -+++ /dev/null -@@ -1,22 +0,0 @@ --opam-version: "2.0" --maintainer: "Daniel B??nzli <daniel.buenzl [email protected]>" --authors: ["Daniel B??nzli <daniel.buenzl [email protected]>"] --homepage: "http://erratique.ch/software/uutf"; --doc: "http://erratique.ch/software/uutf/doc/Uutf"; --dev-repo: "git+http://erratique.ch/repos/uutf.git"; --bug-reports: "https://github.com/dbuenzli/uutf/issues"; --tags: [ "unicode" "text" "utf-8" "utf-16" "codec" "org:erratique" ] --license: "ISC" --depends: [ -- "ocaml" {>= "4.01.0"} -- "ocamlfind" {build} -- "ocamlbuild" {build} -- "topkg" {build} -- "uchar" --] --depopts: ["cmdliner"] --conflicts: ["cmdliner" { < "0.9.6"} ] --build: [[ -- "ocaml" "pkg/pkg.ml" "build" -- "--pinned" "%{pinned}%" -- "--with-cmdliner" "%{cmdliner:installed}%" ]] -\ No newline at end of file --- /dev/null +++ b/src/dune @@ -0,0 +1,5 @@ @@ -37,41 +11,4 @@ + (public_name uutf) + (flags (:standard -w -3-27)) + (wrapped false)) ---- /dev/null -+++ b/uutf.opam -@@ -0,0 +1,34 @@ -+opam-version: "2.0" -+maintainer: "Daniel B??nzli <daniel.buenzl [email protected]>" -+authors: ["Daniel B??nzli <daniel.buenzl [email protected]>"] -+homepage: "http://erratique.ch/software/uutf"; -+doc: "http://erratique.ch/software/uutf/doc/Uutf"; -+dev-repo: "git+https://github.com/dune-universe/uutf.git"; -+bug-reports: "https://github.com/dbuenzli/uutf/issues"; -+tags: [ "unicode" "text" "utf-8" "utf-16" "codec" "org:erratique" ] -+license: "ISC" -+depends: [ -+ "dune" -+ "ocaml" {>= "4.01.0"} -+ "uchar" -+] -+depopts: ["cmdliner"] -+conflicts: ["cmdliner" { < "0.9.6"} ] -+synopsis: """Non-blocking streaming Unicode codec for OCaml""" -+description: """\ -+ -+Uutf is a non-blocking streaming codec to decode and encode the UTF-8, -+UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently -+work character by character without blocking on IO. Decoders perform -+character position tracking and support newline normalization. -+ -+Functions are also provided to fold over the characters of UTF encoded -+OCaml string values and to directly encode characters in OCaml -+Buffer.t values. -+ -+Uutf has no dependency and is distributed under the ISC license. -+""" -+build: [[ "dune" "build" "-p" name ]] -+url { -+ src: "git://github.com/dune-universe/uutf.git#duniverse-v1.0.2" -+}
