From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Sat, 2 Dec 2017 12:51:01 +0100
Subject: [PATCH] Fix for ocaml 4.06

---
 common/criteria_lexer.mll | 8 ++++----
 common/util.ml            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
index 71f9178..fc4eae3 100644
--- a/common/criteria_lexer.mll
+++ b/common/criteria_lexer.mll
@@ -18,7 +18,7 @@
     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
     (* find the terminating delimiter *)
     let endpos =
-      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
+      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
       |Invalid_argument _ ->
           raise (Format822.Syntax_error (
             Format822.error lexbuf "String too short"))
@@ -27,9 +27,9 @@
             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
     in
     let len = endpos - (lexbuf.lex_start_pos + 3) in
-    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
-    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
-    s
+    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
+    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
+    Bytes.to_string s
 
 }
 
diff --git a/common/util.ml b/common/util.ml
index 598f266..36ca3d1 100644
--- a/common/util.ml
+++ b/common/util.ml
@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
   let clean label =
     try 
       let s = Filename.chop_extension (Filename.basename label) in
-      String.capitalize s
+      String.capitalize_ascii s
     with Invalid_argument _ -> label
 
   let create ?(enabled=false) label =
-- 
2.11.0

txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=cff7415805a547c05a090f96938ca27aa65ab95f'>root</a>/<a href='/guix/log/build-aux?id=cff7415805a547c05a090f96938ca27aa65ab95f'>build-aux</a>/<a href='/guix/log/build-aux/update-NEWS.scm?id=cff7415805a547c05a090f96938ca27aa65ab95f'>update-NEWS.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/update-NEWS.scm?id=cff7415805a547c05a090f96938ca27aa65ab95f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-05-10 13:48:02 -0400'>2021-05-10</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=ed2d4d52dde00bdccc1bb2c93b24ffcc72a7fcd3'>maint: update-NEWS: Sort packages prior writing to the data file.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/update-NEWS.scm (main): Sort packages.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-23 21:32:46 -0400'>2021-04-23</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=18dc8c6f0f76b8d128638105eebad2895f9857f0'>build-aux: Relax the regexp used to match NEWS sections.</a><span class='msg-avail'>...<span class='msg-tooltip'>A number of packages doesn't really make sense in the name of the section to
be substituted.  This change allows using simply '*** new packages' instead of
'*** 1999 new packages', for example, and have the update-NEWS.scm script
update it.

* build-aux/update-NEWS.scm (write-packages-added) &lt;regexp&gt;: Do not care about
leading white space in the name of the section.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-05-20 11:50:21 +0200'>2019-05-20</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=996ecaf64e397341dbed70198032ce828040e5ac'>maint: update-NEWS: Track "gcc-toolchain", not "gcc".</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to d78010b81ee6ef4fd8803082e2f401b9e55b44db.

* build-aux/update-NEWS.scm (write-packages-updates)[important]: Replace
"gcc" by "gcc-toolchain".
</span></span></td><td>Ludovic Courtès</td></tr>