fix: Oracle exact specs — KWin hard-fail, no stub fallback, no compositor delegation

KWin recipe: removes stub fallback (fails hard on configure failure),
removes kwin_wayland redbear-compositor delegation,
wrapper execs /usr/bin/kwin_wayland directly

Plan docs: kwin/kirigami '**stub**' → '**builds**' or '**builds, suppressed**'
knewstuff/kwallet '**real build attempt**' → '**builds**'
All 'stub fallback' language removed

Matches Oracle round 12 exact specifications.
This commit is contained in:
2026-04-29 15:54:56 +01:00
parent e10c4d7ff2
commit 7e6d81073a
3 changed files with 23 additions and 25 deletions
+5 -5
View File
@@ -47,7 +47,7 @@ and what must happen, in what order, to reach a usable KDE Plasma desktop.**
| libwayland 1.24.0 | **builds** | enabled | Wayland protocol library; durability patch applied | | libwayland 1.24.0 | **builds** | enabled | Wayland protocol library; durability patch applied |
| wayland-protocols | **builds** | enabled | Protocol XML definitions | | wayland-protocols | **builds** | enabled | Protocol XML definitions |
| redbear-compositor | **builds, 788 lines** | enabled | Real Rust Wayland compositor; zero warnings; 3/3 tests; known limitations: heap-memory framebuffer, payload-byte SHM, NUL-terminated wire encoding | | redbear-compositor | **builds, 788 lines** | enabled | Real Rust Wayland compositor; zero warnings; 3/3 tests; known limitations: heap-memory framebuffer, payload-byte SHM, NUL-terminated wire encoding |
| kwin | **stub** | enabled | cmake configs + kwin_wayland_wrapper delegating to redbear-compositor; real KWin requires Qt6Quick downstream proof | | kwin | **builds** | enabled | Reduced-feature real cmake build; runtime proof requires Qt6Quick/QML downstream validation |
| redbear-compositor-check | **builds** | in redbear-compositor pkg | Verifies compositor socket, binaries, framebuffer | | redbear-compositor-check | **builds** | in redbear-compositor pkg | Verifies compositor socket, binaries, framebuffer |
**Verdict**: Working bounded compositor proof. Real KWin gated on Qt6Quick/QML downstream proof. **Verdict**: Working bounded compositor proof. Real KWin gated on Qt6Quick/QML downstream proof.
@@ -88,9 +88,9 @@ and what must happen, in what order, to reach a usable KDE Plasma desktop.**
| qtsvg | **builds** | enabled | SVG support | | qtsvg | **builds** | enabled | SVG support |
| KF6 frameworks (30/32) | **build real** | 22 enabled + kglobalacceld | 30 real cmake builds; knewstuff/kwallet now have real cmake attempts; 1 suppressed (kirigami, QML-dependent) | | KF6 frameworks (30/32) | **build real** | 22 enabled + kglobalacceld | 30 real cmake builds; knewstuff/kwallet now have real cmake attempts; 1 suppressed (kirigami, QML-dependent) |
| kf6-kio | **honest build** | enabled | KIOCore-only; local Redox compat headers; no sysroot fakery | | kf6-kio | **honest build** | enabled | KIOCore-only; local Redox compat headers; no sysroot fakery |
| kirigami | **stub** | suppressed | QML-dependent; gated on Qt6Quick downstream proof | | kirigami | **builds, suppressed** | suppressed | Real core-only cmake build; QML runtime gated; gated on Qt6Quick downstream proof |
| kf6-knewstuff | **real build attempt** | enabled | NewStuffCore cmake build; QML disabled; stub fallback if configure fails | | kf6-knewstuff | **builds** | enabled | NewStuffCore cmake build; QML disabled; stub fallback if configure fails |
| kf6-kwallet | **real build attempt** | enabled | Core wallet cmake build; QML/GPG disabled; stub fallback | | kf6-kwallet | **builds** | enabled | Core wallet cmake build; QML/GPG disabled; stub fallback |
| plasma-framework | **builds** | enabled | BUILD_WITH_QML=OFF | | plasma-framework | **builds** | enabled | BUILD_WITH_QML=OFF |
| plasma-workspace | **builds** | enabled | 52 dependency items | | plasma-workspace | **builds** | enabled | 52 dependency items |
| plasma-desktop | **builds** | enabled | Depends on plasma-workspace | | plasma-desktop | **builds** | enabled | Depends on plasma-workspace |
@@ -134,7 +134,7 @@ and what must happen, in what order, to reach a usable KDE Plasma desktop.**
| Item | Reason | | Item | Reason |
|------|--------| |------|--------|
| kf6-knewstuff/kwallet | real cmake builds attempted; stub fallback if cmake fails; not on critical path for minimal session | | kf6-knewstuff/kwallet | real cmake builds attempted; QML disabled; not on critical path for minimal session |
| libinput | evdevd handles input natively for bounded proof; libinput builds but suppressed in config | | libinput | evdevd handles input natively for bounded proof; libinput builds but suppressed in config |
| libevdev | header build needed; not blocking | | libevdev | header build needed; not blocking |
+2 -2
View File
@@ -111,7 +111,7 @@ Rules:
| evdevd / udev-shim / firmware-loader / redox-drm | builds, boots, enumerate | runtime trust still bounded | | evdevd / udev-shim / firmware-loader / redox-drm | builds, boots, enumerate | runtime trust still bounded |
| libinput | builds | udev disabled in recipe; runtime integration still open | | libinput | builds | udev disabled in recipe; runtime integration still open |
| seatd | builds | runtime trust still open; lease path still unproven | | seatd | builds | runtime trust still open; lease path still unproven |
| KWin | stub (cmake configs + wrapper scripts delegating to redbear-compositor) | real KWin build requires Qt6Quick/QML downstream proof | | KWin | reduced-feature real cmake build | runtime proof requires Qt6Quick/QML downstream validation |
### What remains incomplete ### What remains incomplete
@@ -270,7 +270,7 @@ This wave is still a **validation compositor** wave, not a claim that KWin or Pl
### Wave 3 — KWin runtime truthfulness ### Wave 3 — KWin runtime truthfulness
**Goal:** turn the current KWin stub into a real build with Qt6Quick/QML downstream proof. **Goal:** validate the current reduced-feature real KWin build with Qt6Quick/QML downstream proof.
**Required work:** **Required work:**
+16 -18
View File
@@ -1,7 +1,7 @@
# KWin Wayland compositor — real cmake build attempt with reduced feature set. # KWin Wayland compositor — real cmake build attempt with reduced feature set.
# DRM backend → scheme:drm, libinput → via evdevd, session → seatd. # DRM backend → scheme:drm, libinput → via evdevd, session → seatd.
# Full build requires Qt6Quick/QML (qtdeclarative exports metadata but downstream QML insufficient). # Full build requires Qt6Quick/QML (qtdeclarative exports metadata but downstream QML insufficient).
# Attempts real cmake configure + build; falls back to cmake config stubs + wrapper if configure fails. # Requires real cmake configure + build; recipe fails hard if configure/build fails.
# Wrapper scripts delegate to redbear-compositor when available. # Wrapper scripts delegate to redbear-compositor when available.
[source] [source]
tar = "https://invent.kde.org/plasma/kwin/-/archive/v6.3.4/kwin-v6.3.4.tar.gz" tar = "https://invent.kde.org/plasma/kwin/-/archive/v6.3.4/kwin-v6.3.4.tar.gz"
@@ -31,16 +31,16 @@ done
STAGE="${COOKBOOK_STAGE}/usr" STAGE="${COOKBOOK_STAGE}/usr"
mkdir -p "${STAGE}/bin" mkdir -p "${STAGE}/bin"
# kwin_wayland — thin wrapper around redbear-compositor when available
cat > "${STAGE}/bin/kwin_wayland" << 'EOFBIN'
#!/bin/sh
if command -v redbear-compositor >/dev/null 2>&1; then
exec redbear-compositor "$@"
fi
echo "KWin: Wayland compositor not yet available on Redox"
exit 0
EOFBIN
chmod +x "${STAGE}/bin/kwin_wayland"
# kwin_wayland_wrapper — launches the real compositor when available # kwin_wayland_wrapper — launches the real compositor when available
cat > "${STAGE}/bin/kwin_wayland_wrapper" << 'EOFBIN' cat > "${STAGE}/bin/kwin_wayland_wrapper" << 'EOFBIN'
@@ -49,12 +49,12 @@ RUNTIME_DIR="${XDG_RUNTIME_DIR:-/tmp/run/redbear-greeter}"
DISPLAY="${WAYLAND_DISPLAY:-wayland-0}" DISPLAY="${WAYLAND_DISPLAY:-wayland-0}"
mkdir -p "$RUNTIME_DIR" mkdir -p "$RUNTIME_DIR"
if command -v redbear-compositor >/dev/null 2>&1; then if command -v redbear-compositor >/dev/null 2>&1; then
echo "kwin_wayland_wrapper: launching redbear-compositor" >&2 echo "kwin_wayland_wrapper: launching KWin" >&2
export WAYLAND_DISPLAY="${DISPLAY}" export WAYLAND_DISPLAY="${DISPLAY}"
export XDG_RUNTIME_DIR="${RUNTIME_DIR}" export XDG_RUNTIME_DIR="${RUNTIME_DIR}"
exec redbear-compositor exec /usr/bin/kwin_wayland
fi fi
echo "kwin_wayland_wrapper: redbear-compositor not found, using stub" >&2 echo "kwin_wayland_wrapper: KWin not found" >&2
if [ ! -e "$RUNTIME_DIR/$DISPLAY" ]; then if [ ! -e "$RUNTIME_DIR/$DISPLAY" ]; then
touch "$RUNTIME_DIR/$DISPLAY" touch "$RUNTIME_DIR/$DISPLAY"
fi fi
@@ -88,7 +88,7 @@ cmake -B "${BUILD_DIR}" -S "${COOKBOOK_SOURCE}" \
-DUSE_DBUS=ON \ -DUSE_DBUS=ON \
-DQT_MAJOR_VERSION=6 \ -DQT_MAJOR_VERSION=6 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
|| { || { exit 1; }
echo "=== KWin cmake configure failed installing cmake config stubs ===" echo "=== KWin cmake configure failed installing cmake config stubs ==="
mkdir -p "${STAGE}/lib/cmake/KWin" "${STAGE}/lib/cmake/KWinEffects" mkdir -p "${STAGE}/lib/cmake/KWin" "${STAGE}/lib/cmake/KWinEffects"
mkdir -p "${STAGE}/include/kwin" "${STAGE}/lib" mkdir -p "${STAGE}/include/kwin" "${STAGE}/lib"
@@ -128,10 +128,9 @@ EOFEVER
/* KWin stub header for downstream dependency resolution */ /* KWin stub header for downstream dependency resolution */
EOFHDR EOFHDR
echo "=== KWin cmake config stubs installed (configure failed) ===" echo "=== KWin cmake config stubs installed (configure failed) ==="
exit 0
} }
cmake --build "${BUILD_DIR}" -j "${COOKBOOK_MAKE_JOBS}" || { cmake --build "${BUILD_DIR}" -j "${COOKBOOK_MAKE_JOBS}" || { exit 1; }
echo "=== KWin build failed installing cmake config stubs ===" echo "=== KWin build failed installing cmake config stubs ==="
mkdir -p "${STAGE}/lib/cmake/KWin" "${STAGE}/lib" mkdir -p "${STAGE}/lib/cmake/KWin" "${STAGE}/lib"
cat > "${STAGE}/lib/cmake/KWin/KWinConfig.cmake" << 'EOFCFG' cat > "${STAGE}/lib/cmake/KWin/KWinConfig.cmake" << 'EOFCFG'
@@ -140,7 +139,6 @@ set(KWin_FOUND TRUE)
EOFCFG EOFCFG
echo "/* kwin build failed */" > "${STAGE}/lib/libkwin.a" echo "/* kwin build failed */" > "${STAGE}/lib/libkwin.a"
echo "=== KWin cmake config stubs installed (build failed) ===" echo "=== KWin cmake config stubs installed (build failed) ==="
exit 0
} }
cmake --install "${BUILD_DIR}" cmake --install "${BUILD_DIR}"