[ocaml-pxp] Rebuild for OCaml 4.00.0.

[Richard W.M. Jones]

commit 46b448fb26277968e707fd0c5e7e5af02dfe8eea
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Jun 9 16:50:45 2012 +0100

    Rebuild for OCaml 4.00.0.

 ocaml-pxp.spec          |   10 +++++-
 pxp-1.2.2-ocaml-4.patch |   78 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletions(-)
---
diff --git a/ocaml-pxp.spec b/ocaml-pxp.spec
index 5cd51be..8c19da3 100644
--- a/ocaml-pxp.spec
+++ b/ocaml-pxp.spec
@@ -2,7 +2,7 @@
 
 Name:           ocaml-pxp
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validating XML parser
 
 Group:          Development/Libraries
@@ -25,6 +25,9 @@ BuildRequires:  ocaml-camlp4-devel
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
+Patch0:         pxp-1.2.2-ocaml-4.patch
+
+
 %description
 PXP is a validating XML parser for O'Caml. It represents the parsed
 document either as tree or as stream of events. In tree mode, it is
@@ -50,6 +53,7 @@ developing applications that use %{name}.
   -without-wlex \
   -without-wlex-compat \
   -lexlist all
+%patch0 -p1
 
 
 %build
@@ -106,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun  9 2012 Richard W.M. Jones <rjones at redhat.com> - 1.2.2-3
+- Rebuild for OCaml 4.00.0.
+- Patch for new ocamldoc library.
+
 * Fri Jan 06 2012 Richard W.M. Jones <rjones at redhat.com> - 1.2.2-2
 - Rebuild for OCaml 3.12.1.
 
diff --git a/pxp-1.2.2-ocaml-4.patch b/pxp-1.2.2-ocaml-4.patch
new file mode 100644
index 0000000..bc5811b
--- /dev/null
+++ b/pxp-1.2.2-ocaml-4.patch
@@ -0,0 +1,78 @@
+--- pxp-1.2.2.old/tools/src/odoc/chtml.ml	2011-06-10 19:16:23.000000000 +0100
++++ pxp-1.2.2/tools/src/odoc/chtml.ml	2012-06-09 16:52:49.159548718 +0100
+@@ -48,9 +48,11 @@
+ 
+ 
+ 
+-class chtml =
++module Generator (G : Odoc_html.Html_generator) =
++struct
++class html =
+ object(self)
+-  inherit Odoc_html.html as super
++  inherit G.html as super
+ 
+   method private html_of_picture b t = 
+ prerr_endline "picture found";
+@@ -138,30 +140,32 @@
+ 	name in
+     super # html_of_Ref b name' ref_opt
+ 
+-  method add_known_type t =
+-    List.iter
+-      (fun s ->
+-	 known_types_names <- StringSet.add s known_types_names
+-      )
+-      (split_args t)
+-
+-  method add_known_class t =
+-    List.iter
+-      (fun s ->
+-	 known_classes_names <- StringSet.add s known_classes_names
+-      )
+-      (split_args t)
+-
+   method html_of_custom_text b s t =
++    let add_known_type t =
++      List.iter
++        (fun s ->
++	   known_types_names <- StringSet.add s known_types_names
++        )
++        (split_args t)
++    in
++
++    let add_known_class t =
++      List.iter
++        (fun s ->
++          known_classes_names <- StringSet.add s known_classes_names
++        )
++        (split_args t)
++    in
++
+     match s with
+       | "{picture" -> self#html_of_picture b t
+       | "{directinclude" -> self#html_of_direct_include b t
+       | "{fixpxpcoretypes" -> self#html_of_fix_pxp_core_types b t
+-      | "{knowntype" -> self#add_known_type t
+-      | "{knownclass" -> self#add_known_class t
++      | "{knowntype" -> add_known_type t
++      | "{knownclass" -> add_known_class t
+       | _ -> ()
++  end
+ end
+ 
+-let chtml = new chtml
+ let _ = 
+-  Odoc_args.set_doc_generator (Some chtml :> Odoc_args.doc_generator option)
++  Odoc_args.extend_html_generator (module Generator : Odoc_gen.Html_functor)
+--- pxp-1.2.2.old/src/pxp-engine/Makefile.code	2011-06-10 19:16:20.000000000 +0100
++++ pxp-1.2.2/src/pxp-engine/Makefile.code	2012-06-09 16:54:54.043916916 +0100
+@@ -3,6 +3,8 @@
+ 
+ PACKAGES = netstring
+ 
++OCAMLC_OPTIONS = -I +compiler-libs
++
+ OBJ =   pxp_lexing.cmo \
+         pxp_core_types.cmo pxp_lexer_types.cmo \
+ 	pxp_lex_aux.cmo pxp_lexers.cmo \