Merge branch 'fix/gui/gtk' into 'stable/iron'

[gui] Uses gtk3 rather than gtk2 when both are available.

See merge request frama-c/frama-c!3992

src/plugins/callgraph/gui/dune

@@ -41,8 +41,8 @@
   (libraries
     frama-c.kernel frama-c.gui frama-c-callgraph.core
     (select graph.ml from
-      (ocamlgraph.dgraph -> graph.dgraph.ml)
-      (ocamlgraph_gtk -> graph.gtk.ml)
+      (!lablgtk3-sourceview3 ocamlgraph.dgraph -> graph.dgraph.ml)
+      (!lablgtk3-sourceview3 ocamlgraph_gtk -> graph.gtk.ml)
     )
   )
 )

src/plugins/gui/dune

@@ -30,7 +30,7 @@
           (echo "  - lablgtk2.sourceview2:" %{lib-available:lablgtk2.sourceview2} "\n")
           (echo "  - lablgtk3:" %{lib-available:lablgtk3} "\n")
           (echo "  - lablgtk3-sourceview3:" %{lib-available:lablgtk3-sourceview3} "\n")
-          ; From a GUI hook registered by RteGen. 
+          ; From a GUI hook registered by RteGen.
           (echo "  - Rtegen (optional):" %{lib-available:frama-c-rtegen.core} "\n")
   )
   )
@@ -62,23 +62,23 @@
   (flags -open Frama_c_kernel -linkall :standard -w -9)
   (libraries frama-c.init.gui frama-c.kernel
    (select gtk_compat.ml from
-      (lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 -> gtk_compat.2.ml)
       (lablgtk3 lablgtk3-sourceview3 -> gtk_compat.3.ml)
+      (lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 -> gtk_compat.2.ml)
    )
    (select GSourceView.ml from
-      (lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 -> GSourceView.2.ml)
       (lablgtk3 lablgtk3-sourceview3 -> GSourceView.3.ml)
+      (lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 -> GSourceView.2.ml)
    )
    (select GSourceView.mli from
-      (lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 -> GSourceView.2.mli)
       (lablgtk3 lablgtk3-sourceview3 -> GSourceView.3.mli)
+      (lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 -> GSourceView.2.mli)
    )
    (select dgraph_helper.ml from
-      (ocamlgraph.dgraph -> dgraph_helper.yes.ml)
+      (!lablgtk3-sourceview3 ocamlgraph.dgraph -> dgraph_helper.yes.ml)
       ( -> dgraph_helper.no.ml)
    )
    (select debug_manager.ml from
-      (ocamlgraph.dgraph -> debug_manager.ok.ml)
+      (!lablgtk3-sourceview3 ocamlgraph.dgraph -> debug_manager.ok.ml)
       ( -> debug_manager.ko.ml)
    )
 )