summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2021-03-22 11:51:37 +0100
committerJonas Ådahl <jadahl@gmail.com>2022-01-14 09:27:07 +0100
commit66ebc660b4ab446a03f4421d02f71dcddd2a88b0 (patch)
tree47273da3e7a72d51fb3777b8ee8e4f164a772f24 /.gitlab-ci
parentc71cb35e9dc3cf4dc109ce64dbd7731c93018f56 (diff)
downloadgtk+-66ebc660b4ab446a03f4421d02f71dcddd2a88b0.tar.gz
wayland/surface: Use wl_surface_offset() instead of x,y of attach()
This makes the hotspot of DND surfaces work when using the Vulkan and OpenGL renderers. This bumps the CI image used to the newly built image. This is needed to install a new enough libwayland-client.so needed for wl_surface.offset. This is done by adding wayland as a meson subproject, building it on-demand if the version in the system is not new enough. As libwayland-client.so is pulled in implicitly when linking to gtk4, the compile step needs LD_LIBRARY_PATH set to make ld find the right library to link to.
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/fedora.Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 97ece0e7ff..31bb1697f5 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -95,6 +95,8 @@ RUN dnf -y install \
weston-libs \
which \
xorg-x11-server-Xvfb \
+ && dnf install -y 'dnf-command(builddep)' \
+ && dnf builddep -y wayland \
&& dnf clean all
# Enable sudo for wheel users