[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

5 files changed, 40 insertions, 259 deletions

diff --git a/dev/build/windows/patches_coq/VST.patch b/dev/build/windows/patches_coq/VST.patch
index 2c8c46373f..2c8c46373f 100755..100644
--- a/dev/build/windows/patches_coq/VST.patch
+++ b/dev/build/windows/patches_coq/VST.patch
diff --git a/dev/build/windows/patches_coq/flexdll-0.37.patch b/dev/build/windows/patches_coq/flexdll-0.37.patch
new file mode 100644
index 0000000000..82806f9ea4
--- /dev/null
+++ b/dev/build/windows/patches_coq/flexdll-0.37.patch
@@ -0,0 +1,19 @@
+diff/patch file created on Tue, Feb 19, 2019  9:41:26 PM with:
+difftar-folder.sh tarballs/flexdll-0.37.tar.gz flexdll-0.37 1
+TARFILE= tarballs/flexdll-0.37.tar.gz
+FOLDER= flexdll-0.37
+TARSTRIP= 1
+TARPREFIX= flexdll-0.37/
+ORIGFOLDER= flexdll-0.37.orig
+--- flexdll-0.37.orig/cmdline.ml	2017-10-25 10:40:46.000000000 +0200
++++ flexdll-0.37/cmdline.ml	2019-02-19 21:41:18.157024900 +0100
+@@ -248,6 +248,9 @@
+         String.sub s 0 2 :: String.sub s 2 (String.length s - 2) :: tr rest
+     | s :: rest when String.length s >= 5 && String.sub s 0 5 = "/link" ->
+         "-link" :: String.sub s 5 (String.length s - 5) :: tr rest
++    (* Convert gcc linker option prefix -Wl, to flexlink linker prefix -link *)
++    | s :: rest when String.length s >= 6 && String.sub s 0 5 = "-Wl,-" ->
++        "-link" :: String.sub s 4 (String.length s - 4) :: tr rest
+     | "-arg" :: x :: rest ->
+         tr (Array.to_list (Arg.read_arg x)) @ rest
+     | "-arg0" :: x :: rest ->
diff --git a/dev/build/windows/patches_coq/gtksourceview-2.11.2.patch b/dev/build/windows/patches_coq/gtksourceview-2.11.2.patch
deleted file mode 100644
index 73a098d12a..0000000000
--- a/dev/build/windows/patches_coq/gtksourceview-2.11.2.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourceiter.c gtksourceview-2.11.2.patched/gtksourceview/gtksourceiter.c
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourceiter.c	2010-05-30 12:24:14.000000000 +0200
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourceiter.c	2015-10-27 14:58:54.422888400 +0100
-***************
-*** 80,86 ****
-  	/* If string contains prefix, check that prefix is not followed
-  	 * by a unicode mark symbol, e.g. that trailing 'a' in prefix
-  	 * is not part of two-char a-with-hat symbol in string. */
-! 	return type != G_UNICODE_COMBINING_MARK &&
-  		type != G_UNICODE_ENCLOSING_MARK &&
-  		type != G_UNICODE_NON_SPACING_MARK;
-  }
---- 80,86 ----
-  	/* If string contains prefix, check that prefix is not followed
-  	 * by a unicode mark symbol, e.g. that trailing 'a' in prefix
-  	 * is not part of two-char a-with-hat symbol in string. */
-! 	return type != G_UNICODE_SPACING_MARK &&
-  		type != G_UNICODE_ENCLOSING_MARK &&
-  		type != G_UNICODE_NON_SPACING_MARK;
-  }
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourcelanguagemanager.c gtksourceview-2.11.2.patched/gtksourceview/gtksourcelanguagemanager.c
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourcelanguagemanager.c	2010-05-30 12:24:14.000000000 +0200
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourcelanguagemanager.c	2015-10-27 14:55:30.294477600 +0100
-***************
-*** 274,280 ****
-   * containg a list of language files directories.
-   * The array is owned by @lm and must not be modified.
-   */
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
---- 274,280 ----
-   * containg a list of language files directories.
-   * The array is owned by @lm and must not be modified.
-   */
-! const gchar* const *
-  gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
-***************
-*** 392,398 ****
-   * available languages or %NULL if no language is available. The array
-   * is owned by @lm and must not be modified.
-   */
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
---- 392,398 ----
-   * available languages or %NULL if no language is available. The array
-   * is owned by @lm and must not be modified.
-   */
-! const gchar* const *
-  gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourcelanguagemanager.h gtksourceview-2.11.2.patched/gtksourceview/gtksourcelanguagemanager.h
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourcelanguagemanager.h	2009-11-15 00:41:33.000000000 +0100
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourcelanguagemanager.h	2015-10-27 14:55:30.518500000 +0100
-***************
-*** 62,74 ****
-  
-  GtkSourceLanguageManager *gtk_source_language_manager_get_default		(void);
-  
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  			  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
-  
-  void			  gtk_source_language_manager_set_search_path		(GtkSourceLanguageManager *lm,
-  										 gchar                   **dirs);
-  
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  			  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
-  
-  GtkSourceLanguage	 *gtk_source_language_manager_get_language		(GtkSourceLanguageManager *lm,
---- 62,74 ----
-  
-  GtkSourceLanguageManager *gtk_source_language_manager_get_default		(void);
-  
-! const gchar* const *
-  			  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
-  
-  void			  gtk_source_language_manager_set_search_path		(GtkSourceLanguageManager *lm,
-  										 gchar                   **dirs);
-  
-! const gchar* const *
-  			  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
-  
-  GtkSourceLanguage	 *gtk_source_language_manager_get_language		(GtkSourceLanguageManager *lm,
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourcestylescheme.c gtksourceview-2.11.2.patched/gtksourceview/gtksourcestylescheme.c
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourcestylescheme.c	2010-05-30 12:24:14.000000000 +0200
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourcestylescheme.c	2015-10-27 14:55:30.545502700 +0100
-***************
-*** 310,316 ****
-   *
-   * Since: 2.0
-   */
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
---- 310,316 ----
-   *
-   * Since: 2.0
-   */
-! const gchar* const *
-  gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
-***************
-*** 318,324 ****
-  	if (scheme->priv->authors == NULL)
-  		return NULL;
-  
-! 	return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata;
-  }
-  
-  /**
---- 318,324 ----
-  	if (scheme->priv->authors == NULL)
-  		return NULL;
-  
-! 	return (const gchar* const *)scheme->priv->authors->pdata;
-  }
-  
-  /**
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourcestylescheme.h gtksourceview-2.11.2.patched/gtksourceview/gtksourcestylescheme.h
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourcestylescheme.h	2010-03-29 15:02:56.000000000 +0200
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourcestylescheme.h	2015-10-27 14:55:30.565504700 +0100
-***************
-*** 61,67 ****
-  const gchar             *gtk_source_style_scheme_get_name       (GtkSourceStyleScheme *scheme);
-  const gchar             *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
-  
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  			 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
-  
-  const gchar             *gtk_source_style_scheme_get_filename	(GtkSourceStyleScheme *scheme);
---- 61,67 ----
-  const gchar             *gtk_source_style_scheme_get_name       (GtkSourceStyleScheme *scheme);
-  const gchar             *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
-  
-! const gchar* const *
-  			 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
-  
-  const gchar             *gtk_source_style_scheme_get_filename	(GtkSourceStyleScheme *scheme);
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourcestyleschememanager.c gtksourceview-2.11.2.patched/gtksourceview/gtksourcestyleschememanager.c
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourcestyleschememanager.c	2010-05-30 12:24:14.000000000 +0200
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourcestyleschememanager.c	2015-10-27 14:55:30.583506500 +0100
-***************
-*** 515,521 ****
-   * of string containing the search path.
-   * The array is owned by the @manager and must not be modified.
-   */
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
---- 515,521 ----
-   * of string containing the search path.
-   * The array is owned by the @manager and must not be modified.
-   */
-! const gchar* const *
-  gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
-***************
-*** 554,560 ****
-   * of string containing the ids of the available style schemes or %NULL if no
-   * style scheme is available. The array is owned by the @manager and must not be modified.
-   */
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
---- 554,560 ----
-   * of string containing the ids of the available style schemes or %NULL if no
-   * style scheme is available. The array is owned by the @manager and must not be modified.
-   */
-! const gchar* const *
-  gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
-  {
-  	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
-diff -c -r gtksourceview-2.11.2.orig/gtksourceview/gtksourcestyleschememanager.h gtksourceview-2.11.2.patched/gtksourceview/gtksourcestyleschememanager.h
-*** gtksourceview-2.11.2.orig/gtksourceview/gtksourcestyleschememanager.h	2009-11-15 00:41:33.000000000 +0100
---- gtksourceview-2.11.2.patched/gtksourceview/gtksourcestyleschememanager.h	2015-10-27 14:56:24.498897500 +0100
-***************
-*** 73,84 ****
-  void 			 gtk_source_style_scheme_manager_prepend_search_path   (GtkSourceStyleSchemeManager	*manager,
-  						    				 const gchar			*path);
-  
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  			 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
-  
-  void			 gtk_source_style_scheme_manager_force_rescan		(GtkSourceStyleSchemeManager	*manager);
-  
-! G_CONST_RETURN gchar* G_CONST_RETURN *
-  			 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
-  
-  GtkSourceStyleScheme	*gtk_source_style_scheme_manager_get_scheme		(GtkSourceStyleSchemeManager	*manager,
---- 73,84 ----
-  void 			 gtk_source_style_scheme_manager_prepend_search_path   (GtkSourceStyleSchemeManager	*manager,
-  						    				 const gchar			*path);
-  
-! const gchar* const *
-  			 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
-  
-  void			 gtk_source_style_scheme_manager_force_rescan		(GtkSourceStyleSchemeManager	*manager);
-  
-! const gchar* const *
-  			 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
-  
-  GtkSourceStyleScheme	*gtk_source_style_scheme_manager_get_scheme		(GtkSourceStyleSchemeManager	*manager,
diff --git a/dev/build/windows/patches_coq/lablgtk-2.18.6.patch b/dev/build/windows/patches_coq/lablgtk-3.0.beta5.patch
index 23c303135d..1c6a038da9 100644
--- a/dev/build/windows/patches_coq/lablgtk-2.18.6.patch
+++ b/dev/build/windows/patches_coq/lablgtk-3.0.beta5.patch
@@ -1,33 +1,12 @@
-diff/patch file created on Wed, Apr 25, 2018 11:08:05 AM with:
-difftar-folder.sh ../coq-msoegtrop/dev/build/windows/source_cache/lablgtk-2.18.3.tar.gz lablgtk-2.18.3 1
-TARFILE= ../coq-msoegtrop/dev/build/windows/source_cache/lablgtk-2.18.3.tar.gz
-FOLDER= lablgtk-2.18.3
+diff/patch file created on Wed, Feb 20, 2019 11:29:48 AM with:
+difftar-folder.sh tarballs/lablgtk-3.0.beta4.tar.gz lablgtk-3.0.beta4 1
+TARFILE= tarballs/lablgtk-3.0.beta4.tar.gz
+FOLDER= lablgtk-3.0.beta4
 TARSTRIP= 1
-TARPREFIX= lablgtk-2.18.3/
-ORIGFOLDER= lablgtk-2.18.3.orig
---- lablgtk-2.18.3.orig/configure	2014-10-29 08:51:05.000000000 +0100
-+++ lablgtk-2.18.3/configure	2018-04-25 10:58:54.454501600 +0200
-@@ -2667,7 +2667,7 @@
- fi
- 
- 
--if test "`$OCAMLFIND printconf stdlib`" != "`$CAMLC -where`"; then
-+if test "`$OCAMLFIND printconf stdlib | tr '\\' '/'`" != "`$CAMLC -where | tr '\\' '/'`"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ocamlfind" >&5
- $as_echo "$as_me: WARNING: Ignoring ocamlfind" >&2;}
-   OCAMLFIND=no
---- lablgtk-2.18.3.orig/src/glib.mli	2014-10-29 08:51:06.000000000 +0100
-+++ lablgtk-2.18.3/src/glib.mli	2018-04-25 10:58:54.493555500 +0200
-@@ -75,6 +75,7 @@
-   type condition = [ `ERR | `HUP | `IN | `NVAL | `OUT | `PRI]
-   type id
-   val channel_of_descr : Unix.file_descr -> channel
-+  val channel_of_descr_socket : Unix.file_descr -> channel
-   val add_watch :
-     cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id
-   val remove : id -> unit
---- lablgtk-2.18.3.orig/src/glib.ml	2014-10-29 08:51:06.000000000 +0100
-+++ lablgtk-2.18.3/src/glib.ml	2018-04-25 10:58:54.479543500 +0200
+TARPREFIX= lablgtk-3.0.beta4/
+ORIGFOLDER= lablgtk-3.0.beta4.orig
+--- lablgtk-3.0.beta4.orig/src/glib.ml	2019-02-11 07:08:17.000000000 +0100
++++ lablgtk-3.0.beta4/src/glib.ml	2019-02-20 11:28:28.439137100 +0100
 @@ -72,6 +72,8 @@
    type id
    external channel_of_descr : Unix.file_descr -> channel
@@ -37,22 +16,18 @@ ORIGFOLDER= lablgtk-2.18.3.orig
    external remove : id -> unit = "ml_g_source_remove"
    external add_watch :
      cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id
---- lablgtk-2.18.3.orig/src/Makefile	2014-10-29 08:51:06.000000000 +0100
-+++ lablgtk-2.18.3/src/Makefile	2018-04-25 10:58:54.506522500 +0200
-@@ -461,9 +461,9 @@
- 	  do rm -f "$(BINDIR)"/$$f; done
- 
- lablgtk.cma liblablgtk2$(XA): $(COBJS) $(MLOBJS)
--	$(LIBRARIAN) -o lablgtk -oc lablgtk2 $^ $(GTKLIBS)
-+	$(LIBRARIAN) -ldopt "-link -Wl,-s" -o lablgtk -oc lablgtk2 $^ $(GTKLIBS)
- lablgtk.cmxa: $(COBJS) $(MLOBJS:.cmo=.cmx)
--	$(LIBRARIAN) -o lablgtk -oc lablgtk2 $^ $(GTKLIBS)
-+	$(LIBRARIAN) -ldopt "-link -Wl,-s" -o lablgtk -oc lablgtk2 $^ $(GTKLIBS)
- lablgtk.cmxs: DYNLINKLIBS=$(GTK_LIBS)
- 
- lablgtkgl.cma liblablgtkgl2$(XA): $(GLCOBJS) $(GLMLOBJS)
---- lablgtk-2.18.3.orig/src/ml_glib.c	2014-10-29 08:51:06.000000000 +0100
-+++ lablgtk-2.18.3/src/ml_glib.c	2018-04-25 10:58:54.539535600 +0200
+--- lablgtk-3.0.beta4.orig/src/glib.mli	2019-02-11 07:08:17.000000000 +0100
++++ lablgtk-3.0.beta4/src/glib.mli	2019-02-20 11:28:28.423592200 +0100
+@@ -75,6 +75,7 @@
+   type condition = [ `ERR | `HUP | `IN | `NVAL | `OUT | `PRI]
+   type id
+   val channel_of_descr : Unix.file_descr -> channel
++  val channel_of_descr_socket : Unix.file_descr -> channel
+   val add_watch :
+     cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id
+   val remove : id -> unit
+--- lablgtk-3.0.beta4.orig/src/ml_glib.c	2019-02-11 07:08:17.000000000 +0100
++++ lablgtk-3.0.beta4/src/ml_glib.c	2019-02-20 11:28:28.455395900 +0100
 @@ -25,6 +25,8 @@
  #include <string.h>
  #include <locale.h>
@@ -74,7 +49,7 @@ ORIGFOLDER= lablgtk-2.18.3.orig
  #include "wrappers.h"
  #include "ml_glib.h"
  #include "glib_tags.h"
-@@ -325,14 +332,23 @@
+@@ -326,14 +333,23 @@
  
  #ifndef _WIN32
  ML_1 (g_io_channel_unix_new, Int_val, Val_GIOChannel_noref)
diff --git a/dev/build/windows/patches_coq/quickchick.patch b/dev/build/windows/patches_coq/quickchick.patch
index 1afa6e7f95..1afa6e7f95 100755..100644
--- a/dev/build/windows/patches_coq/quickchick.patch
+++ b/dev/build/windows/patches_coq/quickchick.patch