From 5411b892a06784002688b66f815a97d0ec22ebca Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 14 Jan 2021 12:38:01 +0100 Subject: [PATCH] build: Bump gsettings-desktop-schemas dependency We will depend on new settings there, ensure we build depend on it, and CI pulls the dependency. Part-of: --- .gitlab-ci.yml | 6 +++++- meson.build | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 224d407cb..58518fb2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ stages: .mutter.fedora:33@common: variables: FDO_DISTRIBUTION_VERSION: 33 - BASE_TAG: '2020-11-23.0' + BASE_TAG: '2021-01-14.0' FDO_UPSTREAM_REPO: GNOME/mutter FDO_DISTRIBUTION_EXEC: | dnf install -y 'dnf-command(builddep)' && @@ -38,6 +38,10 @@ stages: https://gitlab.gnome.org/GNOME/gdm.git \ 3.38.0 . && + ./.gitlab-ci/install-meson-project.sh \ + https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \ + 40.alpha . && + dnf clean all default: diff --git a/meson.build b/meson.build index c9d50514e..5b4be8081 100644 --- a/meson.build +++ b/meson.build @@ -22,7 +22,7 @@ uprof_req = '>= 0.3' pango_req = '>= 1.46.0' cairo_req = '>= 1.10.0' pangocairo_req = '>= 1.20' -gsettings_desktop_schemas_req = '>= 3.37.2' +gsettings_desktop_schemas_req = '>= 40.alpha' json_glib_req = '>= 0.12.0' upower_glib_req = '>= 0.99.0' xcomposite_req = '>= 0.4'