[gnome-initial-setup/wip/wjt/ci-f36] ci: Use Fedora 36 packages for all dependencies

[Will Thompson <wjt src gnome org>]

commit 3ce9a6f45af0a689f97fafb39105aa7710af989a
Author: Will Thompson <wjt endlessos org>
Date:   Fri May 27 16:55:24 2022 +0100

    ci: Use Fedora 36 packages for all dependencies
    
    New enough versions of all these dependencies are now available as
    distro packages.

 .gitlab-ci.yml | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e911faf0..5accdc00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ stages:
     # to the release number/branch to ensure that
     # a new image will be created, tailored for the
     # stable branch.
-    FDO_DISTRIBUTION_TAG: '2022-02-19.2-main'
-    FDO_DISTRIBUTION_VERSION: 34
+    FDO_DISTRIBUTION_TAG: '2022-05-27.1-main'
+    FDO_DISTRIBUTION_VERSION: 36
 
 # See also https://gitlab.freedesktop.org/freedesktop/ci-templates
 build.container.fedora@x86_64:
@@ -45,12 +45,16 @@ build.container.fedora@x86_64:
       gnome-online-accounts-devel
       gobject-introspection-devel
       gstreamer1-devel
+      gsettings-desktop-schemas-devel
       gtk3-devel
       gtk4-devel
       gtk-doc
       ibus-devel
       iso-codes-devel
       krb5-devel
+      libgnome-desktop4-devel
+      libgweather4-devel
+      libhandy-devel
       libnma-devel
       libpwquality-devel
       libseccomp-devel
@@ -64,36 +68,6 @@ build.container.fedora@x86_64:
       webkit2gtk3-devel
       xkeyboard-config-devel
 
-    FDO_DISTRIBUTION_EXEC: |-
-      mkdir /tmp/deps && \
-      pushd /tmp/deps && \
-        git clone --depth 1 https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \
-          cd gsettings-desktop-schemas && \
-          meson . _build --prefix=/usr/local && \
-          ninja -C _build -v && \
-          ninja -C _build -v install && \
-          cd .. && \
-        git clone --depth 1 https://gitlab.gnome.org/GNOME/libgweather.git && \
-          cd libgweather && \
-          meson . _build --prefix=/usr/local -Denable_vala=false -Dgtk_doc=false -Dintrospection=false 
-Dtests=false && \
-          ninja -C _build -v && \
-          ninja -C _build -v install && \
-          cd .. && \
-        git clone --depth 1 https://gitlab.gnome.org/GNOME/gnome-desktop.git && \
-          cd gnome-desktop && \
-          meson . _build --prefix=/usr/local -Dwerror=false -Dgtk_doc=false -Ddesktop_docs=false 
-Dlegacy_library=false && \
-          ninja -C _build -v && \
-          ninja -C _build -v install && \
-          cd .. && \
-        git clone --depth 1 https://gitlab.gnome.org/GNOME/libhandy.git && \
-          cd libhandy && \
-          meson . _build --prefix=/usr/local -Dexamples=false -Dglade_catalog=disabled -Dgtk_doc=false 
-Dintrospection=disabled -Dprofiling=false -Dtests=false -Dvapi=false && \
-          ninja -C _build -v && \
-          ninja -C _build -v install && \
-          cd .. && \
-        popd && \
-      rm -rf /tmp/deps
-
 .job_template: &job_definition
   extends:
     - '.fdo.distribution-image@fedora'