[Pkg-ocaml-maint-commits] [mlpost] 03/07: Fix for ocamldoc >= 4

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository mlpost.

commit c63be20b016e4656eb50dd5392fc8d0b2835ca06
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Nov 10 19:33:28 2013 +0100

    Fix for ocamldoc >= 4
---
 debian/patches/0006-Fix-for-ocamldoc-4.patch |   42 ++++++++++++++++++++++++++
 debian/patches/series                        |    1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/0006-Fix-for-ocamldoc-4.patch b/debian/patches/0006-Fix-for-ocamldoc-4.patch
new file mode 100644
index 0000000..4140157
--- /dev/null
+++ b/debian/patches/0006-Fix-for-ocamldoc-4.patch
@@ -0,0 +1,42 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sun, 10 Nov 2013 19:32:54 +0100
+Subject: Fix for ocamldoc >= 4
+
+---
+ customdoc/img.ml | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/customdoc/img.ml b/customdoc/img.ml
+index 31eea9a..6dd316b 100644
+--- a/customdoc/img.ml
++++ b/customdoc/img.ml
+@@ -1,9 +1,9 @@
+-class my_gen =
+-  object(self)
+-    inherit Odoc_html.html
++module MyGenerator (G : Odoc_html.Html_generator) = struct
++  class html = object(self)
++    inherit G.html
+ 
+     (** Return HTML code for the given text of a bar tag. *)
+-    method html_of_img t = 
++    method private html_of_img t =
+       match t with 
+       | [] -> ""
+       | (x::r) ->
+@@ -16,11 +16,11 @@ class my_gen =
+     initializer
+       tag_functions <- ("img", self#html_of_img) :: tag_functions
+   end
++end
+ 
+-let my_generator = new my_gen
+ let _ = 
+-  Odoc_args.set_doc_generator 
+-         (Some my_generator :> Odoc_args.doc_generator option) ;
++  Odoc_args.extend_html_generator
++    (module MyGenerator : Odoc_gen.Html_functor);
+   (* we need to deactivate the -html option of ocamldoc, otherwise our generator
+    * is overwritten by the standard html generator. Ocamlbuild gives the -html
+    * option to ocamldoc, so this is really required *)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 25a0eea..c18d115 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-hyphen-escapes-in-manpage.patch
 0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
 0005-Fully-qualify-name-of-input-ed-files.patch
+0006-Fix-for-ocamldoc-4.patch

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