[gnome-initial-setup/wjt/use-gnome-desktop-4] Use gnome-desktop-4

[Will Thompson <wjt src gnome org>]

commit 3254ad37a1abb1286d5293aa46ee62f68d160113
Author: Will Thompson <will willthompson co uk>
Date:   Thu Dec 16 20:11:50 2021 +0000

    Use gnome-desktop-4
    
    This new library links neither to GTK 3 nor to GTK 4.
    
    A Meson .wrap file is included for the time being, since there isn't a
    release containing gnome-desktop-4 yet.

 .gitignore                      | 1 +
 .gitlab-ci.yml                  | 4 ++++
 gnome-initial-setup/meson.build | 2 +-
 subprojects/gnome-desktop.wrap  | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 68823ac7..46c5836f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 # Build directories
 /build
 /_build-*
+/subprojects/gnome-desktop
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4668f0f8..106d89ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,10 @@ stages:
       --auto-features ${AUTO_FEATURES}
       ${OPTIONS}
       -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations
+      -Dgnome-desktop:werro=false
+      -Dgnome-desktop:gtk_doc=false
+      -Dgnome-desktop:desktop_docs=false
+      -Dgnome-desktop:legacy_library=false
       ${EXTRA_PARAMETERS}
       _build .
     - cd _build
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 1d2388ba..35c1668d 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -32,7 +32,7 @@ dependencies = [
     dependency ('libnma', version: '>= 1.0'),
     dependency ('polkit-gobject-1', version: '>= 0.103'),
     dependency ('accountsservice'),
-    dependency ('gnome-desktop-3.0', version: '>= 3.7.5'),
+    dependency ('gnome-desktop-4', fallback: ['gnome-desktop', 'libgnome_desktop_base_dep']),
     dependency ('gsettings-desktop-schemas', version: '>= 3.37.1'),
     dependency ('fontconfig'),
     dependency ('gweather-3.0'),
diff --git a/subprojects/gnome-desktop.wrap b/subprojects/gnome-desktop.wrap
new file mode 100644
index 00000000..50a8d751
--- /dev/null
+++ b/subprojects/gnome-desktop.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://gitlab.gnome.org/GNOME/gnome-desktop.git
+revision = master