brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Bump gsettings-desktop-schemas dependency

Browse Source 
We will depend on new settings there, ensure we build depend on
it, and CI pulls the dependency.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1416>
This commit is contained in:
Carlos Garnacho 2021-01-14 12:38:01 +01:00 committed by Marge Bot
parent 2c57f0986a
commit 5411b892a0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -12,7 +12,7 @@ stages:
.mutter.fedora:33@common: .mutter.fedora:33@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_VERSION: 33
BASE_TAG: '2020-11-23.0' BASE_TAG: '2021-01-14.0'
FDO_UPSTREAM_REPO: GNOME/mutter FDO_UPSTREAM_REPO: GNOME/mutter
FDO_DISTRIBUTION_EXEC: | FDO_DISTRIBUTION_EXEC: |
dnf install -y 'dnf-command(builddep)' && dnf install -y 'dnf-command(builddep)' &&
@ -38,6 +38,10 @@ stages:
https://gitlab.gnome.org/GNOME/gdm.git \ https://gitlab.gnome.org/GNOME/gdm.git \
3.38.0 . && 3.38.0 . &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
40.alpha . &&
dnf clean all dnf clean all
default: default:

2
meson.build
View File

@ -22,7 +22,7 @@ uprof_req = '>= 0.3'
pango_req = '>= 1.46.0' pango_req = '>= 1.46.0'
cairo_req = '>= 1.10.0' cairo_req = '>= 1.10.0'
pangocairo_req = '>= 1.20' pangocairo_req = '>= 1.20'
gsettings_desktop_schemas_req = '>= 3.37.2' gsettings_desktop_schemas_req = '>= 40.alpha'
json_glib_req = '>= 0.12.0' json_glib_req = '>= 0.12.0'
upower_glib_req = '>= 0.99.0' upower_glib_req = '>= 0.99.0'
xcomposite_req = '>= 0.4' xcomposite_req = '>= 0.4'