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>
This commit is contained in:
Jonas Ådahl 2022-12-22 11:49:48 +01:00 committed by Marge Bot
parent ca70c1dfb5
commit f34c6da956
2 changed files with 6 additions and 2 deletions

View File

@ -18,7 +18,7 @@ variables:
.mutter.fedora@common: .mutter.fedora@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 37 FDO_DISTRIBUTION_VERSION: 37
BASE_TAG: '2022-12-17.0' BASE_TAG: '2022-12-22.0'
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
asciidoc asciidoc
clang clang
@ -51,6 +51,10 @@ variables:
https://gitlab.gnome.org/jadahl/catch.git \ https://gitlab.gnome.org/jadahl/catch.git \
main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 && 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 && pip install git+https://github.com/martinpitt/python-dbusmock.git@743da675c37bfc469ec385b88c3b4ad4838cfa48 &&
rpm -e --nodeps gnome-bluetooth-libs-devel \ rpm -e --nodeps gnome-bluetooth-libs-devel \

View File

@ -16,7 +16,7 @@ mutter_builddir = meson.current_build_dir()
lcms2_req = '>= 2.6' lcms2_req = '>= 2.6'
colord_req = '>= 1.4.5' colord_req = '>= 1.4.5'
fribidi_req = '>= 1.0.0' fribidi_req = '>= 1.0.0'
glib_req = '>= 2.69.0' glib_req = '>= 2.75.1'
gi_req = '>= 0.9.5' gi_req = '>= 0.9.5'
graphene_req = '>= 1.10.2' graphene_req = '>= 1.10.2'
gtk3_req = '>= 3.19.8' gtk3_req = '>= 3.19.8'