fix: copy Qt6 wayland protocols from qtbase staging to qtwayland sysroot
qtwayland build failed because qt_internal_get_wayland_protocols_dir() resolves to a path under the sysroot, but the cookbook's dependency resolution doesn't propagate usr/share/ files between recipes. The text-input-unstable-v2.xml protocol file exists in qtbase's stage/usr/share/qt6/wayland/protocols/ but was never copied into qtwayland's sysroot, causing the Qt Wayland code generator to silently fail producing qwayland-server-text-input-unstable-v2.cpp.
This commit is contained in:
@@ -69,6 +69,18 @@ fi
|
||||
|
||||
redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules
|
||||
|
||||
# Copy Qt6 wayland protocol XMLs from qtbase staging (not propagated by cookbook)
|
||||
QTBASE_STAGE="${COOKBOOK_ROOT}/local/recipes/qt/qtbase/target/x86_64-unknown-redox/stage/usr"
|
||||
if [ -d "${QTBASE_STAGE}/share/qt6/wayland/protocols" ]; then
|
||||
mkdir -p "${COOKBOOK_SYSROOT}/usr/share/qt6/wayland"
|
||||
cp -a "${QTBASE_STAGE}/share/qt6/wayland/protocols" \
|
||||
"${COOKBOOK_SYSROOT}/usr/share/qt6/wayland/protocols"
|
||||
elif [ -d "${COOKBOOK_SYSROOT}/usr/share/qt6/wayland/protocols" ]; then
|
||||
:
|
||||
else
|
||||
echo "WARNING: Qt6 wayland protocols not found — text-input/v2 generation will fail"
|
||||
fi
|
||||
|
||||
cmake "${COOKBOOK_SOURCE}" \
|
||||
-DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \
|
||||
-DQT_HOST_PATH="${HOST_BUILD}" \
|
||||
|
||||
Reference in New Issue
Block a user