diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-03-22 11:51:37 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2022-01-14 09:27:07 +0100 |
| commit | 66ebc660b4ab446a03f4421d02f71dcddd2a88b0 (patch) | |
| tree | 47273da3e7a72d51fb3777b8ee8e4f164a772f24 /.gitlab-ci.yml | |
| parent | c71cb35e9dc3cf4dc109ce64dbd7731c93018f56 (diff) | |
| download | gtk+-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.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b01ec772c..279faf373b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v35" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v36" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" .only-default: @@ -88,7 +88,7 @@ fedora-x86_64: - meson compile -C _build - meson install -C _build - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello - - meson compile -C _build_hello + - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello - .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build wayland - .gitlab-ci/run-tests.sh _build waylandgles |