diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2022-12-22 11:49:48 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-01-30 15:11:26 +0000 |
| commit | f34c6da9569d71bef7a329294e4d55a65d142875 (patch) | |
| tree | 6e81783dc300b303dc0fa7b2e8631c41869a7959 | |
| parent | ca70c1dfb5d5792e25df4e23f3ff89cc05dffb3e (diff) | |
| download | mutter-f34c6da9569d71bef7a329294e4d55a65d142875.tar.gz | |
build: Depend on glib 2.75
This allows us to use g_clear_fd().
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2806>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e652a97a..349b40ee6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: .mutter.fedora@common: variables: FDO_DISTRIBUTION_VERSION: 37 - BASE_TAG: '2022-12-17.0' + BASE_TAG: '2022-12-22.0' FDO_DISTRIBUTION_PACKAGES: asciidoc clang @@ -51,6 +51,10 @@ variables: https://gitlab.gnome.org/jadahl/catch.git \ main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 && + ./.gitlab-ci/install-meson-project.sh \ + https://gitlab.gnome.org/GNOME/glib.git \ + 2.75.1 . && + pip install git+https://github.com/martinpitt/python-dbusmock.git@743da675c37bfc469ec385b88c3b4ad4838cfa48 && rpm -e --nodeps gnome-bluetooth-libs-devel \ diff --git a/meson.build b/meson.build index 25c744065..03d16ae07 100644 --- a/meson.build +++ b/meson.build @@ -16,7 +16,7 @@ mutter_builddir = meson.current_build_dir() lcms2_req = '>= 2.6' colord_req = '>= 1.4.5' fribidi_req = '>= 1.0.0' -glib_req = '>= 2.69.0' +glib_req = '>= 2.75.1' gi_req = '>= 0.9.5' graphene_req = '>= 1.10.2' gtk3_req = '>= 3.19.8' |