Merge branch 'master' into background-portal

meson.build

@@ -39,8 +39,14 @@ else
     libsoup_dep = dependency('libsoup-2.4')
 endif
 gmodule_dep = dependency('gmodule-2.0')
-champlain_dep = dependency('champlain-0.12')
-champlain_gtk_dep = dependency('champlain-gtk-0.12')
+champlain_dep = dependency('champlain-0.12', fallback: ['libchamplain', 'libchamplain_dep'], default_options: ['default_library=static', 'introspection=false', 'vapi=false'])
+champlain_gtk_dep = dependency('champlain-gtk-0.12', fallback: ['libchamplain', 'libchamplain_gtk_dep'], default_options: ['default_library=static', 'introspection=false', 'vapi=false'])
+# We need to force the inclusion of the Vapi in case of fallback
+if (champlain_dep.type_name() == 'internal')
+    vapi_dir = meson.current_source_dir() / 'vapi'
+    champlain_dep = [champlain_dep, meson.get_compiler('vala').find_library('champlain-0.12', dirs: vapi_dir)]
+    champlain_gtk_dep = [champlain_gtk_dep, meson.get_compiler('vala').find_library('champlain-gtk-0.12', dirs: vapi_dir)]
+endif
 clutter_dep = dependency('clutter-1.0')
 clutter_gtk_dep = dependency('clutter-gtk-1.0')
 folks_dep = dependency('folks')

subprojects/libchamplain.wrap

@@ -0,0 +1,8 @@
+[wrap-git]
+directory = libchamplain
+url = https://gitlab.gnome.org/GNOME/libchamplain.git
+revision = 941560af497148588783db991e8135f52a82574d
+depth = 1
+
+[provide]
+dependency_names = champlain-0.12, champlain-gtk-0.12

vapi/champlain-0.12.deps

@@ -0,0 +1,4 @@
+clutter-1.0
+cogl-pango-1.0
+atk
+pangocairo