From be201fc2042d8f3fc4b80faf16d96f9e8d2e7004 Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Fri, 19 Jan 2024 15:15:00 +0100 Subject: [PATCH] gitlab-ci.yml: Bump wayland-protocols to 1.33 Signed-off-by: Robert Mader --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-deps.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa2e3027a..c98d5bd53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2023-10-05-neatvnc-0.7.0' + FDO_DISTRIBUTION_TAG: '2024-01-19-wayland-protocols-1.33-7' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index 565f3e54b..32fff4ed1 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -33,6 +33,12 @@ export PATH=$HOME/.local/bin:$PATH # Breathe (a bridge between Doxygen and Sphinx), and we use the Read the Docs # theme for the final presentation. pip3 install $PIP_ARGS sphinx==4.2.0 +pip3 install $PIP_ARGS sphinxcontrib-applehelp==1.0.4 +pip3 install $PIP_ARGS sphinxcontrib-devhelp==1.0.2 +pip3 install $PIP_ARGS sphinxcontrib-htmlhelp==2.0.0 +pip3 install $PIP_ARGS sphinxcontrib-jsmath==1.0.1 +pip3 install $PIP_ARGS sphinxcontrib-qthelp==1.0.3 +pip3 install $PIP_ARGS sphinxcontrib-serializinghtml==1.1.5 pip3 install $PIP_ARGS breathe==4.31.0 pip3 install $PIP_ARGS sphinx_rtd_theme==1.0.0 @@ -117,7 +123,7 @@ rm -rf wayland # Keep this version in sync with our dependency in meson.build. If you wish to # raise a MR against custom protocol, please change this reference to clone # your relevant tree, and make sure you bump $FDO_DISTRIBUTION_TAG. -git clone --branch 1.31 --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols +git clone --branch 1.33 --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols cd wayland-protocols git show -s HEAD meson build --wrap-mode=nofallback