diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2022-04-22 08:28:17 +0200 |
|---|---|---|
| committer | Corentin Noël <tintou@noel.tf> | 2022-04-22 08:50:52 +0200 |
| commit | 4ac90aa90efdf7bc5fa80507aab3def8af94130a (patch) | |
| tree | 07fd7c98bd8fe34245598f5d64277655f6bbed52 | |
| parent | 43ae37a93ee862d2a3770a1ba5be0e1dcbc18751 (diff) | |
| download | mutter-tintou/gnome-desktop-4.tar.gz | |
meson: Use gnome-desktop-4tintou/gnome-desktop-4
This is a drop-in replacement of gnome-desktop-3.0 in our case.
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a9b3441e..974fc76ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: .mutter.fedora:35@common: variables: FDO_DISTRIBUTION_VERSION: 35 - BASE_TAG: '2022-03-05.0' + BASE_TAG: '2022-04-22.0' FDO_DISTRIBUTION_PACKAGES: asciidoc clang @@ -49,6 +49,8 @@ variables: dnf builddep -y xorg-x11-server-Xwayland --setopt=install_weak_deps=False && dnf install -y 'pkgconfig(fontutil)' && dnf install -y 'pkgconfig(libxcvt)' && + # Until Mutter is using gnome-desktop-4 upstream + dnf install -y 'pkgconfig(gnome-desktop-4)' && ./.gitlab-ci/install-meson-project.sh \ -Dxwayland=true \ @@ -485,3 +487,4 @@ dist-mutter-tarball: - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz rules: - if: '$CI_COMMIT_TAG' + - if: '$CI_COMMIT_TAG' diff --git a/meson.build b/meson.build index a10232bbb..7e98db215 100644 --- a/meson.build +++ b/meson.build @@ -149,7 +149,7 @@ have_x11 = true have_gnome_desktop = get_option('libgnome_desktop') if have_gnome_desktop - gnome_desktop_dep = dependency('gnome-desktop-3.0') + gnome_desktop_dep = dependency('gnome-desktop-4') endif have_gl = get_option('opengl') |