[ocaml-type-conv] Patch for 3.12.0 compat

Michael Ekstrand ekstrand at fedoraproject.org
Mon Sep 26 23:27:21 UTC 2011


commit 18f2bd1feb6897fb31e097827bc0d701eca7ed0a
Author: Michael Ekstrand <michael at elehack.net>
Date:   Tue Sep 20 20:23:49 2011 -0500

    Patch for 3.12.0 compat

 ocaml-type-conv.spec                |    3 +++
 type-conv-ocaml-3.12.0-compat.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/ocaml-type-conv.spec b/ocaml-type-conv.spec
index 52f7eaf..d9c964b 100644
--- a/ocaml-type-conv.spec
+++ b/ocaml-type-conv.spec
@@ -15,6 +15,8 @@ Source0:        http://forge.ocamlcore.org/frs/download.php/%{dlnode}/type-conv-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
+Patch0:         type-conv-ocaml-3.12.0-compat.patch
+
 BuildRequires:  ocaml >= 3.12.0
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamldoc
@@ -34,6 +36,7 @@ ability to use these preprocessors simultaneously.
 
 %prep
 %setup -q -n type-conv-%{version}
+%patch0 -p1 -b .compat3120
 ocaml setup.ml -configure --prefix %{_prefix} \
       --libdir %{_libdir} \
       --libexecdir %{_libexecdir} \
diff --git a/type-conv-ocaml-3.12.0-compat.patch b/type-conv-ocaml-3.12.0-compat.patch
new file mode 100644
index 0000000..4c6a562
--- /dev/null
+++ b/type-conv-ocaml-3.12.0-compat.patch
@@ -0,0 +1,12 @@
+Index: type-conv-3.0.4/lib/pa_type_conv.ml
+===================================================================
+--- type-conv-3.0.4.orig/lib/pa_type_conv.ml
++++ type-conv-3.0.4/lib/pa_type_conv.ml
+@@ -323,7 +323,6 @@ module Gen = struct
+       | <:module_type< >> -> false
+       | <:module_type< functor ($_$ : $_$) -> $_$ >>
+       | <:module_type< sig $_$ end >>
+-      | <:module_type< module type of $_$ >>
+       | Ast.MtAnt _ -> bad_type tp
+     in
+     loop tp


More information about the scm-commits mailing list