From 631f1c3949f2974e6f09358a5f2825e3eef3f558 Mon Sep 17 00:00:00 2001 From: Nikita Tsarev Date: Wed, 26 Nov 2025 12:37:08 +0100 Subject: [PATCH] JBR-9699 Build with newer wayland-protocols Updates the CI build scripts to look for wayland protocols in /opt/wayland-protocols --- jb/project/tools/linux/scripts/mkimages_aarch64.sh | 7 +++++++ jb/project/tools/linux/scripts/mkimages_x64.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/jb/project/tools/linux/scripts/mkimages_aarch64.sh b/jb/project/tools/linux/scripts/mkimages_aarch64.sh index 326a6e2b9b94..76847b153e2f 100755 --- a/jb/project/tools/linux/scripts/mkimages_aarch64.sh +++ b/jb/project/tools/linux/scripts/mkimages_aarch64.sh @@ -27,6 +27,12 @@ JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64} function do_configure { GTK_SHELL_PATH=/gtk-shell.xml + WAYLAND_PROTOCOLS_PATH=/opt/wayland-protocols + WITH_WAYLAND_PROTOCOLS= + + if [ -e "$WAYLAND_PROTOCOLS_PATH" ]; then + WITH_WAYLAND_PROTOCOLS="--with-wayland-protocols=$WAYLAND_PROTOCOLS_PATH" + fi if [ ! -e $GTK_SHELL_PATH ]; then echo $GTK_SHELL_PATH" does not exist" @@ -54,6 +60,7 @@ function do_configure { $REPRODUCIBLE_BUILD_OPTS \ $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \ $WITH_BUNDLED_FREETYPE \ + $WITH_WAYLAND_PROTOCOLS \ || do_exit $? } diff --git a/jb/project/tools/linux/scripts/mkimages_x64.sh b/jb/project/tools/linux/scripts/mkimages_x64.sh index 87c2515c92d0..8c8c5248348b 100755 --- a/jb/project/tools/linux/scripts/mkimages_x64.sh +++ b/jb/project/tools/linux/scripts/mkimages_x64.sh @@ -34,6 +34,12 @@ function do_configure { fi GTK_SHELL_PATH=/gtk-shell.xml + WAYLAND_PROTOCOLS_PATH=/opt/wayland-protocols + WITH_WAYLAND_PROTOCOLS= + + if [ -e "$WAYLAND_PROTOCOLS_PATH" ]; then + WITH_WAYLAND_PROTOCOLS="--with-wayland-protocols=$WAYLAND_PROTOCOLS_PATH" + fi if [ ! -e $GTK_SHELL_PATH ]; then echo $GTK_SHELL_PATH" does not exist" @@ -68,6 +74,7 @@ function do_configure { $REPRODUCIBLE_BUILD_OPTS \ $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \ $WITH_BUNDLED_FREETYPE \ + $WITH_WAYLAND_PROTOCOLS \ || do_exit $? }