[Pkg-ocaml-maint-commits] [camomile] 06/10: Import upstream fix for OCaml 4.05

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository camomile.

commit f192c8036de0064e99b7b6cbe88fe0d20e6fc312
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jul 18 10:02:29 2017 +0200

    Import upstream fix for OCaml 4.05
---
 ...patibility-use-explicit-module-signatures.patch | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/0003-4.05-compatibility-use-explicit-module-signatures.patch b/debian/patches/0003-4.05-compatibility-use-explicit-module-signatures.patch
new file mode 100644
index 0000000..7c4343e
--- /dev/null
+++ b/debian/patches/0003-4.05-compatibility-use-explicit-module-signatures.patch
@@ -0,0 +1,42 @@
+From: Gabriel Scherer <gabriel.scherer at gmail.com>
+Date: Fri, 24 Feb 2017 22:30:23 -0500
+Subject: 4.05 compatibility: use explicit module signatures
+
+In 4.05, checking for non-generalizable inference variable ('_a)
+(forbidden in toplevel modules and functors) happens before checking
+the .ml file against the .mli signature, so non-generalizable
+variables that were previously resolved through the .mli constraint
+are now underspecified and result in a compilation failure
+(see MPR#7414, GPR#929). This commit adds enough annotations to avoid
+such underspecified variables in functors.
+---
+ internal/unimap.ml  | 2 +-
+ public/uCharInfo.ml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/internal/unimap.ml b/internal/unimap.ml
+index b6fdbde..6a7cc30 100644
+--- a/internal/unimap.ml
++++ b/internal/unimap.ml
+@@ -58,7 +58,7 @@ val of_name : string -> t
+ end
+ 
+ 
+-module Make (Config : ConfigInt.Type) = struct
++module Make (Config : ConfigInt.Type) : Type = struct
+ 
+ type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
+ 
+diff --git a/public/uCharInfo.ml b/public/uCharInfo.ml
+index 69bf141..6a0337a 100644
+--- a/public/uCharInfo.ml
++++ b/public/uCharInfo.ml
+@@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : unit -> UCharTbl.Bool.t
+ 
+ end
+ 
+-module Make (Config : ConfigInt.Type) = struct
++module Make (Config : ConfigInt.Type) : Type = struct
+ include Unidata.Make(Config)
+ 
+ (* General category *)
diff --git a/debian/patches/series b/debian/patches/series
index e5a8a8f..fdb3c0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Makefile.patch
 0002-Install-missing-camomileLibrary.a.patch
+0003-4.05-compatibility-use-explicit-module-signatures.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/camomile.git