Fix FTBFS with OCaml 4.08.1 (Closes: #944600)

2 files changed, 71 insertions, 0 deletions

diff --git a/debian/patches/0001-Fix-FTBFS-with-OCaml-4.08.1.patch b/debian/patches/0001-Fix-FTBFS-with-OCaml-4.08.1.patch
new file mode 100644
index 0000000..11f53dd
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-with-OCaml-4.08.1.patch
@@ -0,0 +1,70 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Wed, 12 Aug 2020 15:35:00 +0200
+Subject: Fix FTBFS with OCaml 4.08.1
+
+Bug-Debian: https://bugs.debian.org/944600
+---
+ Makefile                 | 2 +-
+ _tags                    | 1 +
+ melt/mlpost_on.ml        | 2 +-
+ melt/tool.ml             | 2 +-
+ meltpp/plugin_private.ml | 1 -
+ 5 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 99ef55e..fb5dd93 100644
+--- a/Makefile
++++ b/Makefile
+@@ -100,4 +100,4 @@ dist: noob.makefile
+ .PHONY: default fast world clean doc all world.10 bench test check dist check-ocamlbuild
+ 
+ Config: configure.ml totoconf.ml
+-	ocaml configure.ml
++	ocaml -unsafe-string configure.ml
+diff --git a/_tags b/_tags
+index fe6cb21..10d8403 100644
+--- a/_tags
++++ b/_tags
+@@ -1,3 +1,4 @@
+ <melt/tool.*>: use_unix, use_str
+ <latop/latop.*>: use_unix, use_str
+ <meltpp/*.*>: use_unix, use_dynlink, use_str
++true: unsafe_string
+diff --git a/melt/mlpost_on.ml b/melt/mlpost_on.ml
+index e63cc8b..f1f650b 100644
+--- a/melt/mlpost_on.ml
++++ b/melt/mlpost_on.ml
+@@ -82,7 +82,7 @@ let mlpost_gen includegraphics ?(mode = mode) ?file f =
+   in
+   let ext = match mode with
+     | `Pdf -> ".mps"
+-    | `Ps -> ".1"
++    | `Ps -> ".mps"
+     | `Cairo -> ".pdf"
+     | `Mps -> ".mps"
+   in
+diff --git a/melt/tool.ml b/melt/tool.ml
+index 2ff5cd1..5971ced 100644
+--- a/melt/tool.ml
++++ b/melt/tool.ml
+@@ -236,7 +236,7 @@ let ml_to_tex f =
+   let meltlibo = libopt "melt" in
+   let mlpostlibo =
+     if Melt.compiled_with_mlpost then libopt "mlpost" else "" in
+-  let strlibo = libopt "str" in
++  let strlibo = "" in
+   let unixlibo = libopt "unix" in
+   let ext = if !native then "native" else "byte" in
+   let ocamlc_includes = match !includes with
+diff --git a/meltpp/plugin_private.ml b/meltpp/plugin_private.ml
+index 6f05a05..3d0a366 100644
+--- a/meltpp/plugin_private.ml
++++ b/meltpp/plugin_private.ml
+@@ -60,7 +60,6 @@ let load_plugin =
+   let init = ref false in
+   fun name ->
+     if not !init then begin
+-      Dynlink.init ();
+       Dynlink.prohibit ["Ast"; "Lexer"; "Parser"; "Plugin_private"];
+       init := true;
+     end;
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a5ca133 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-FTBFS-with-OCaml-4.08.1.patch