From e3501ed973ddf4958e309d855c4d5d762e2f6e9d Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Sat, 9 Feb 2019 20:59:04 +0100
Subject: [coqide] [ci] Update GTK toolchain to lablgtk3

- Update Docker images to install compatible version of lablgtk3
- We remove unnecesary variables from configure.
- We fix path detection of GTK libs in makefile
---
 ide/dune             | 2 +-
 ide/ide.mllib        | 1 -
 ide/wg_Detachable.ml | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'ide')

diff --git a/ide/dune b/ide/dune
index 5082d84c4f..e3e61609af 100644
--- a/ide/dune
+++ b/ide/dune
@@ -29,7 +29,7 @@
  (wrapped false)
  (modules (:standard \ document fake_ide idetop coqide_main))
  (optional)
- (libraries coqide-server.protocol coqide-server.core lablgtk3.sourceview3))
+ (libraries coqide-server.protocol coqide-server.core lablgtk3-sourceview3))
 
 (rule
  (targets coqide_os_specific.ml)
diff --git a/ide/ide.mllib b/ide/ide.mllib
index a7ade71307..30ac5c9ad7 100644
--- a/ide/ide.mllib
+++ b/ide/ide.mllib
@@ -9,7 +9,6 @@ Config_lexer
 Utf8_convert
 Preferences
 Project_file
-Topfmt
 Ideutils
 Coq
 Coq_lex
diff --git a/ide/wg_Detachable.ml b/ide/wg_Detachable.ml
index d753687077..755a42eadd 100644
--- a/ide/wg_Detachable.ml
+++ b/ide/wg_Detachable.ml
@@ -15,6 +15,9 @@ class type detachable_signals =
     method detached : callback:(GObj.widget -> unit) -> unit
   end
 
+(* Cannot do a local warning in 4.05.0, fixme when we use a newer
+   OCaml to avoid the warning in the method itself. *)
+[@@@ocaml.warning "-7"]
 class detachable (obj : ([> Gtk.box] as 'a) Gobject.obj) =
 
   object(self)
-- 
cgit v1.2.3