From 21f3e2a3236ec4592841bda69873c16eceead19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 31 Aug 2023 10:42:36 +0200 Subject: [PATCH] build: Bump libei version requirement Part-of: --- .gitlab-ci.yml | 7 ++++++- meson.build | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 824dd1e1f..1e4b9d527 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ variables: - .skip-git-clone variables: FDO_DISTRIBUTION_VERSION: 39 - BASE_TAG: '2023-08-14.1' + BASE_TAG: '2023-08-31.0' MUTTER_USER: 'meta-user' FDO_DISTRIBUTION_PACKAGES: asciidoc @@ -117,6 +117,7 @@ variables: dnf builddep -y mutter --setopt=install_weak_deps=False dnf builddep -y gnome-shell --setopt=install_weak_deps=False dnf builddep -y kernel --setopt=install_weak_deps=False + dnf builddep -y libei --setopt=install_weak_deps=False ./.gitlab-ci/install-meson-project.sh \ https://gitlab.gnome.org/jadahl/catch.git \ @@ -126,6 +127,10 @@ variables: https://gitlab.gnome.org/GNOME/glib.git \ main . a7c34b431bfaf3d56de64cb1cfea851ac11099d3 + ./.gitlab-ci/install-meson-project.sh \ + https://gitlab.freedesktop.org/libinput/libei.git \ + 1.0.901 . + rpm -e --nodeps gnome-bluetooth-libs-devel \ mutter mutter-devel \ gnome-shell diff --git a/meson.build b/meson.build index 3516a92e1..17a945335 100644 --- a/meson.build +++ b/meson.build @@ -39,7 +39,7 @@ libcanberra_req = '>= 0.26' libwacom_req = '>= 0.13' atk_req = '>= 2.5.3' harfbuzz_req = '>= 2.6' -libei_req = '>= 1.0.0' +libei_req = '>= 1.0.901' # optional version requirements udev_req = '>= 228'