From 668f5bdd3d87221942240996d2f504908445775e Mon Sep 17 00:00:00 2001 From: Vasilito Date: Fri, 1 May 2026 00:54:31 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20KWin=20recipe=20=E2=80=94=20remove=20stu?= =?UTF-8?q?b=20wrapper=20fallback=20(per=20project=20policy)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed: - || true from cmake build/install (failures now propagate) - kwin_wayland wrapper script that delegated to redbear-compositor - kwin_wayland_wrapper script Kept: - cmake config stubs (KF6WindowSystem, KF6Config) needed by plasma-* - Real cmake build attempt with QML/Quick disabled - Honest #TODO documenting QML gate as blocker Redbear-compositor provides kwin_wayland as a separate package, not as a recipe-level stub. Per project policy: zero tolerance for shortcuts, workarounds, and stubs. --- local/recipes/kde/kwin/recipe.toml | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/local/recipes/kde/kwin/recipe.toml b/local/recipes/kde/kwin/recipe.toml index e1058390..0579f8fd 100644 --- a/local/recipes/kde/kwin/recipe.toml +++ b/local/recipes/kde/kwin/recipe.toml @@ -1,7 +1,8 @@ #TODO: KWin — Qt6::Sensors now available (2026-04-30). Remaining blockers: -# libinput (still ignored in config), QML/Quick (JIT disabled on Redox), -# no canberra in-tree. Attempting bounded cmake build with these disabled. -# Falls back to redbear-compositor wrapper on build failure. +# QML/Quick (JIT disabled on Redox) prevents full KWin build. +# Recipe attempts bounded cmake build; if QML gate is resolved, +# the build will succeed. Until then, kwin_wayland is provided +# by redbear-compositor (separate package, not a stub). [source] tar = "https://invent.kde.org/plasma/kwin/-/archive/v6.3.4/kwin-v6.3.4.tar.gz" blake3 = "2aa1e234a75b0aa94f0da3a74d93e2a8e49b30a3afb12dc24b2ecd3abaa94e7f" @@ -74,28 +75,11 @@ if cmake "${COOKBOOK_SOURCE}" \ -DKWIN_BUILD_RUNNERS=OFF \ -DKWIN_BUILD_NOTIFICATIONS=OFF \ -Wno-dev 2>&1; then - cmake --build . -j${COOKBOOK_MAKE_JOBS} 2>&1 || true - cmake --install . --prefix "${STAGE}" 2>&1 || true + cmake --build . -j${COOKBOOK_MAKE_JOBS} 2>&1 + cmake --install . --prefix "${STAGE}" 2>&1 fi -# Always provide the redbear-compositor fallback wrapper -mkdir -p "${STAGE}/bin" -cat > "${STAGE}/bin/kwin_wayland" << 'EOFBIN' -#!/bin/sh -RUNTIME_DIR="${XDG_RUNTIME_DIR:-/tmp/run/redbear-greeter}" -mkdir -p "$RUNTIME_DIR" -export XDG_RUNTIME_DIR="${RUNTIME_DIR}" -exec /usr/bin/redbear-compositor "$@" -EOFBIN -chmod +x "${STAGE}/bin/kwin_wayland" - -cat > "${STAGE}/bin/kwin_wayland_wrapper" << 'EOFBIN' -#!/bin/sh -exec /usr/bin/kwin_wayland "$@" -EOFBIN -chmod +x "${STAGE}/bin/kwin_wayland_wrapper" - -# Minimal cmake config stubs for downstream KDE recipes +# cmake config stubs for downstream KDE recipes (needed by plasma-*) mkdir -p "${STAGE}/lib/cmake/KF6WindowSystem" "${STAGE}/lib/cmake/KF6Config" cat > "${STAGE}/lib/cmake/KF6WindowSystem/KF6WindowSystemConfig.cmake" << 'EOFCMAKE' find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)