- up to 8.6

[packages/coq.git] / coq-lablgtk2.patch

diff --git a/coq-lablgtk2.patch b/coq-lablgtk2.patch
index dcfc39774becd53bdd4f90e8ec70b88e829915ad..3fa6075e4de45307fe138df614861a205645bbd5 100644 (file)
--- a/coq-lablgtk2.patch
+++ b/coq-lablgtk2.patch
@@ -1,41 +1,22 @@
---- coq-8.1pl4/configure~      2008-10-09 11:40:41.000000000 +0200
-+++ coq-8.1pl4/configure       2009-02-16 14:03:00.496249846 +0100
-@@ -471,13 +471,13 @@
- else
-     case $lablgtkdir_spec in
-       no) 
--          if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then
-+          if [ -f "${CAMLLIB}/lablgtk2/glib.cmi" ]; then
-               lablgtkdir=${CAMLLIB}/lablgtk2
--          elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then
-+          elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.cmi" ]; then
-               lablgtkdir=${CAMLLIB}/site-lib/lablgtk2
-           fi;;
-       yes)
--          if [ ! -f "$lablgtkdir/glib.mli" ]; then
-+          if [ ! -f "$lablgtkdir/glib.cmi" ]; then
-               echo "Incorrect LablGtk2 library (glib.mli not found)."
-               echo "Configuration script failed!"
-               exit 1
-@@ -486,9 +486,6 @@
-     if [ "$lablgtkdir" = "" ]; then
-       echo "LablGtk2 not found: CoqIde will not be available."
-       COQIDE=no
--    elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then
--      echo "LablGtk2 found but too old: CoqIde will not be available."
--      COQIDE=no;
-     elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then 
-       echo "LablGtk2 found, bytecode CoqIde will be used as requested."
-       COQIDE=byte
-@@ -855,11 +852,7 @@
- ####################################################
+--- coq-8.6/configure.ml~      2016-12-08 15:13:52.000000000 +0000
++++ coq-8.6/configure.ml       2017-06-05 23:04:32.311195087 +0000
+@@ -669,8 +669,8 @@
+     yell (sprintf "No such directory '%s' (%s)." dir msg)
+   else if not (Sys.file_exists (dir/"gSourceView2.cmi")) then
+     yell (sprintf "Incomplete LablGtk2 (%s): no %s/gSourceView2.cmi." msg dir)
+-  else if not (Sys.file_exists (dir/"glib.mli")) then
+-    yell (sprintf "Incomplete LablGtk2 (%s): no %s/glib.mli." msg dir)
++  else if not (Sys.file_exists (dir/"glib.cmi")) then
++    yell (sprintf "Incomplete LablGtk2 (%s): no %s/glib.cmi." msg dir)
+   else true
  
- if [ ! "$COQIDE" = "no" ]; then 
--    if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then
-       cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli
--    else
--      cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli
--    fi
- fi  
- 
- ##################################################
+ (** Detect and/or verify the Lablgtk2 location *)
+@@ -701,7 +701,7 @@
+ | Manual | Stdlib ->
+   let test accu f =
+     if accu then
+-      let test = sprintf "grep -q -w %s %S/glib.mli" f dir in
++      let test = sprintf "grep -q -w %s %S/glib.cmi" f dir in
+       Sys.command test = 0
+     else false
+   in