[coq] Add patch to fix build failure with OCaml 4.02.

Richard W.M. Jones rjones at fedoraproject.org
Fri Aug 1 10:16:40 UTC 2014


commit cbafaf92b7d8e4628cf3013fcd42375f360166fa
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Aug 1 11:16:26 2014 +0100

    Add patch to fix build failure with OCaml 4.02.

 coq-comment-string-literal.patch |   11 +++++++++++
 coq.spec                         |   10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/coq-comment-string-literal.patch b/coq-comment-string-literal.patch
new file mode 100644
index 0000000..a1ab99a
--- /dev/null
+++ b/coq-comment-string-literal.patch
@@ -0,0 +1,11 @@
+--- coq-8.4pl4.old/kernel/univ.ml	2014-04-24 16:13:03.000000000 +0100
++++ coq-8.4pl4/kernel/univ.ml	2014-08-01 11:00:10.447233148 +0100
+@@ -226,7 +226,7 @@
+ 
+ 
+ (* between : UniverseLevel.t -> canonical_arc -> canonical_arc list *)
+-(* between u v = {w|u<=w<=v, w canonical}          *)
++(* between u v = { w | u<=w<=v, w canonical }          *)
+ (* between is the most costly operation *)
+ 
+ let between g arcu arcv =
diff --git a/coq.spec b/coq.spec
index 5050451..dccd652 100644
--- a/coq.spec
+++ b/coq.spec
@@ -18,7 +18,7 @@
 
 Name:           coq
 Version:        8.4pl4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Proof management system
 
 License:        LGPLv2
@@ -29,6 +29,9 @@ Source2:        README.coq-emacs
 Source4:        coq.xml
 Source5:        coqide.appdata.xml
 
+# Fix for OCaml 4.02.
+Patch1:         coq-comment-string-literal.patch
+
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp5-devel
 BuildRequires:  ocaml-lablgtk-devel
@@ -130,6 +133,8 @@ This package is not needed to use the Emacs interface.
 %prep
 %setup -q
 
+%patch1 -p1
+
 # Fix some files that are not in UTF-8 encoding
 
 for f in CREDITS doc/LICENSE; do
@@ -302,6 +307,9 @@ mktexlsr &> /dev/null
 %{_emacs_sitelispdir}/coq/*.el
 
 %changelog
+* Fri Aug 01 2014 Richard W.M. Jones <rjones at redhat.com> - 8.4pl4-5
+- Add patch to fix build failure with OCaml 4.02.
+
 * Fri Jul 25 2014 Richard W.M. Jones <rjones at redhat.com> - 8.4pl4-4
 - Rebuild for OCaml 4.02.0 beta.
 


More information about the scm-commits mailing list