commit: 99a0680520e735a19f88fc2937a1c4ccd241442c Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Mon Nov 28 20:27:17 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Nov 28 20:27:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a06805
dev-ml/tyxml: fix build with uutf 1.0 Package-Manager: portage-2.3.2 dev-ml/tyxml/files/uutf.patch | 53 +++++++++++++++++++++++++++++++++++++++++ dev-ml/tyxml/tyxml-4.0.0.ebuild | 3 ++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dev-ml/tyxml/files/uutf.patch b/dev-ml/tyxml/files/uutf.patch new file mode 100644 index 00000000..e7d0a3f --- /dev/null +++ b/dev-ml/tyxml/files/uutf.patch @@ -0,0 +1,53 @@ +Index: tyxml-4.0.0/lib/xml_print.ml +=================================================================== +--- tyxml-4.0.0.orig/lib/xml_print.ml ++++ tyxml-4.0.0/lib/xml_print.ml +@@ -154,15 +154,14 @@ module Utf8 = struct + Uutf.String.fold_utf_8 + (fun _ _ d -> + match d with +- | `Uchar 34 -> +- Buffer.add_string buffer """ +- | `Uchar 38 -> +- Buffer.add_string buffer "&" +- | `Uchar 60 -> +- Buffer.add_string buffer "<" +- | `Uchar 62 -> +- Buffer.add_string buffer ">" +- | `Uchar code -> ++ | `Uchar ucode -> ++ begin ++ match Uchar.to_int ucode with ++ | 34 -> Buffer.add_string buffer """ ++ | 38 -> Buffer.add_string buffer "&" ++ | 60 -> Buffer.add_string buffer "<" ++ | 62 -> Buffer.add_string buffer ">" ++ | code -> + let u = + (* Illegal characters in html + http://en.wikipedia.org/wiki/Character_encodings_in_HTML +@@ -181,9 +180,10 @@ module Utf8 = struct + || code land 0xFFFF = 0xFFFE + || code land 0xFFFF = 0xFFFF + then (warn:=true; Uutf.u_rep) +- else code ++ else ucode + in + Uutf.Buffer.add_utf_8 buffer u ++ end + | `Malformed _ -> + Uutf.Buffer.add_utf_8 buffer Uutf.u_rep; + warn:=true) +Index: tyxml-4.0.0/ppx/ppx_attribute_value.ml +=================================================================== +--- tyxml-4.0.0.orig/ppx/ppx_attribute_value.ml ++++ tyxml-4.0.0/ppx/ppx_attribute_value.ml +@@ -160,7 +160,7 @@ let char ?separated_by:_ ?default:_ loc + let c = + match next decoded with + | None -> Ppx_common.error loc "No character in attribute %s" name +- | Some i when i <= 255 -> Char.chr i ++ | Some i when Uchar.to_int i <= 255 -> Char.chr (Uchar.to_int i) + | Some _ -> + Ppx_common.error loc "Character out of range in attribute %s" name + in diff --git a/dev-ml/tyxml/tyxml-4.0.0.ebuild b/dev-ml/tyxml/tyxml-4.0.0.ebuild index 756ecbf..f18fea8 100644 --- a/dev-ml/tyxml/tyxml-4.0.0.ebuild +++ b/dev-ml/tyxml/tyxml-4.0.0.ebuild @@ -18,13 +18,14 @@ KEYWORDS="~amd64" IUSE="+ppx +camlp4" DEPEND=" - dev-ml/uutf:= + >=dev-ml/uutf-1.0:= dev-ml/ocaml-re:= ppx? ( >=dev-ml/ppx_tools-5:= dev-ml/markup:= ) camlp4? ( dev-ml/camlp4:= )" RDEPEND="${DEPEND}" DOCS=( CHANGES README.md ) +PATCHES=( "${FILESDIR}/uutf.patch" ) src_configure() { oasis_configure_opts="
