Files
RedBear-OS/local/recipes/qt/qtwayland/recipe.toml
T
Red Bear Build System 097dc10f70 qt(0.2.5): bump stack to Qt 6.11.1 (real upstream latest stable)
Bump the entire Qt 6 recipe surface to 6.11.1 as resolved from
download.qt.io on 2026-07-02. Per AGENTS.md fork-adaptation policy,
patches in local/patches/qtbase/* and local/patches/qtdeclarative/*
must be re-applied against the 6.11.1 source tree after this commit;
rebase is open work for the next session.

Verified BLAKE3 hashes for the 6.11.1 tarballs:

  qtbase        c3b83023dc54f1173831bbc80abca1901418ef517875bf8071a4895d3c4a3162
  qtdeclarative 10f2d0662047ceb0ef221b725b59e7fec5c9092a4c10d5acc7daefea5f11b962
  qtwayland     154b80972e472b10330c82d3b171a915959a5d06139289d5b898c16c58de4de8
  qtsvg         49b947e1a96bf0a29a1ee84c231a518a1413d9f3ec360617e405400e510508b2
  qtshadertools 24dcd88b9e752a380067182687032b2139d2f6220d64e4193428434970102ae2
  qtsensors     52ad8a724bc34f724feef197cf29f1cb535831ddd0fbad6e9dfedaa01eef1379

Also:

- qtbase: bumped from 6.8.2 -> 6.11.1. The 6.11.0 source tree had been
  imported under local/recipes/qt/qtbase/source/ by a prior session
  without updating the recipe.toml. This commit aligns the recipe
  with both the imported source and the resolved upstream latest.

- qtshadertools: NEW recipe created. The recipes/qt/qtshadertools
  symlink was dangling (target directory did not exist), making
  qtdeclarative's qtshadertools dependency unresolvable. Now wired
  up following the qt6-sensors recipe pattern. Source tar URL is
  the resolved 6.11.1 upstream; per-repo fetch will populate
  source/ on next build.

What's NOT done (deliberately):

- Patch rebase in local/patches/qtbase/P*.patch and
  local/patches/qtdeclarative/P1-skip-tools-crosscompile.patch.
  These must be re-applied against the 6.11.1 source tree before
  the next build. AGENTS.md policy: rebase, do not remove.

- KF6 6.10 -> 6.27.0 bump (38 framework recipes, 17-minor delta).
  Deferred — multi-day patch-rebase work, out of scope for one session.
  See local/docs/0.2.5-GRAPHICS-FREEZE-PLAN.md §2.2.

- KWin 6.6.5 -> 6.7.2 + wayland-protocols/libdrm/libwayland/...
  bumps (remaining graphics recipes). Deferred.

- No build was attempted. recipe.toml pin is now consistent with
  resolved upstream latest-stable; no source tree replacement has
  happened.
2026-07-02 14:27:27 +03:00

108 lines
4.3 KiB
TOML

#TODO: Qt6 Wayland — client compositor support. OpenGL guards applied for software rendering.
# Runtime validation pending — needs running Wayland compositor.
[source]
tar = "https://download.qt.io/official_releases/qt/6.11/6.11.1/submodules/qtwayland-everywhere-src-6.11.1.tar.xz"
blake3 = "154b80972e472b10330c82d3b171a915959a5d06139289d5b898c16c58de4de8"
[build]
template = "custom"
dependencies = [
"libwayland",
"wayland-protocols",
"qtbase",
]
script = """
DYNAMIC_INIT
source "${COOKBOOK_ROOT}/local/scripts/lib/qt-sysroot.sh"
export LDFLAGS="${LDFLAGS} -lffi"
HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build"
# Clean stale CMake cache
rm -f CMakeCache.txt
rm -rf CMakeFiles
# Qt Wayland requires wayland-scanner as a host tool
# Ensure it's available (comes with libwayland host package)
WAYLAND_SCANNER=$(which wayland-scanner 2>/dev/null || echo "/usr/bin/wayland-scanner")
# Guard OpenGL virtual methods in compositor code — we build without OpenGL
# Only patch if not already patched
SERVER_H="${COOKBOOK_SOURCE}/src/compositor/compositor_api/qwaylandquickitem.h"
if [ -f "${SERVER_H}" ] && ! grep -q 'QT_CONFIG(opengl)' "${SERVER_H}" 2>/dev/null; then
# Some Wayland compositor headers reference QOpenGLContext
# The qtbase build already guards these via QT_CONFIG
:
fi
# Disable compositor shm-emulation-server on Redox.
# It depends on QSharedMemory lock/unlock, which are gated behind systemsemaphore-backed
# sharedmemory support not present in the current Redox Qt stack.
QTWAYLAND_HWI_CMAKE="${COOKBOOK_SOURCE}/src/plugins/hardwareintegration/compositor/CMakeLists.txt"
awk 'index($0, "if(QT_FEATURE_wayland_shm_emulation_server_buffer)") {
print "if(FALSE AND QT_FEATURE_wayland_shm_emulation_server_buffer) # disabled for Redox (no systemsemaphore-backed QSharedMemory locking)";
next
} { print }' "${QTWAYLAND_HWI_CMAKE}" > "${QTWAYLAND_HWI_CMAKE}.tmp"
mv "${QTWAYLAND_HWI_CMAKE}.tmp" "${QTWAYLAND_HWI_CMAKE}"
# Create dummy SBOM to satisfy Qt's install-time reference
mkdir -p "${COOKBOOK_BUILD}/qt_sbom/sbom"
if [ -f "${COOKBOOK_ROOT}/recipes/wip/qt/qtbase/target/x86_64-unknown-redox/build/qt_sbom/staging-qtbase.spdx.in" ]; then
cp "${COOKBOOK_ROOT}/recipes/wip/qt/qtbase/target/x86_64-unknown-redox/build/qt_sbom/staging-qtbase.spdx.in" \
"${COOKBOOK_BUILD}/qt_sbom/sbom/qtbase-6.11.0.spdx"
else
cat > "${COOKBOOK_BUILD}/qt_sbom/sbom/qtbase-6.11.0.spdx" << 'SBOMEOF'
SPDXVersion: SPDX-2.3
DataLicense: CC0-1.0
SPDXID: SPDXRef-DOCUMENT
DocumentName: qtbase-6.11.0
DocumentNamespace: https://qt.io/spdxdocs/qtbase-placeholder
Creator: Tool: Qt Build System
PackageName: qtbase
SPDXID: SPDXRef-Package-qtbase
PackageDownloadLocation: NOASSERTION
FilesAnalyzed: false
SBOMEOF
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}" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \
-DQT_BUILD_TOOLS_BY_DEFAULT=OFF \
-DQT_BUILD_EXAMPLES=OFF \
-DQT_BUILD_TESTS=OFF \
-DFEATURE_wayland_client=ON \
-DFEATURE_wayland_compositor=OFF \
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner \
-DCMAKE_SHARED_LINKER_FLAGS="-lc -lffi" \
-DCMAKE_EXE_LINKER_FLAGS="-lc -lffi" \
-DCMAKE_C_STANDARD_LIBRARIES="-lffi" \
-DCMAKE_CXX_STANDARD_LIBRARIES="-lffi" \
-Wno-dev
cmake --build . -j"${COOKBOOK_MAKE_JOBS}"
cmake --install . --prefix "${COOKBOOK_STAGE}/usr"
# Remove RPATH from all libraries
find "${COOKBOOK_STAGE}" -name '*.so*' -exec patchelf --remove-rpath {} \\; 2>/dev/null || true
"""