fix: Oracle round 7 — all kwin_wayland_wrapper references → redbear-compositor
Replaced in: - config/wayland.toml (session launcher) - redbear-kde-session (KDE session launcher) - redbear-greeter-compositor (compositor selection) - test-kde-session.sh (validation script) - build-system/003-config.patch (durable reapply patch) - GREETER-LOGIN-IMPLEMENTATION-PLAN.md - DBUS-INTEGRATION-PLAN.md Zero kwin_wayland_wrapper references remaining. Redbear-compositor is the single Wayland compositor throughout the entire repo.
This commit is contained in:
@@ -81,13 +81,13 @@ if [ -z "${DBUS_SESSION_BUS_ADDRESS:-}" ] && command -v dbus-launch >/dev/null 2
|
||||
eval "$(dbus-launch --sh-syntax)"
|
||||
fi
|
||||
|
||||
if ! command -v kwin_wayland_wrapper >/dev/null 2>&1; then
|
||||
if ! command -v redbear-compositor >/dev/null 2>&1; then
|
||||
# Fall back to redbear-compositor (simpler Rust compositor)
|
||||
if command -v /usr/bin/redbear-compositor >/dev/null 2>&1 || command -v redbear-compositor >/dev/null 2>&1; then
|
||||
echo "redbear-greeter-compositor: kwin_wayland_wrapper not found, using redbear-compositor" >&2
|
||||
echo "redbear-greeter-compositor: redbear-compositor not found, using redbear-compositor" >&2
|
||||
exec /usr/bin/redbear-compositor
|
||||
fi
|
||||
echo "redbear-greeter-compositor: kwin_wayland_wrapper not found, and redbear-compositor not found either" >&2
|
||||
echo "redbear-greeter-compositor: redbear-compositor not found, and redbear-compositor not found either" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -98,9 +98,9 @@ desired_drm_devices="${KWIN_DRM_DEVICES:-/scheme/drm/card0}"
|
||||
if wait_for_drm_devices "$desired_drm_devices"; then
|
||||
export KWIN_DRM_DEVICES="$desired_drm_devices"
|
||||
echo "redbear-greeter-compositor: using DRM compositor backend (KWIN_DRM_DEVICES=${KWIN_DRM_DEVICES})" >&2
|
||||
exec kwin_wayland_wrapper --drm
|
||||
exec redbear-compositor --drm
|
||||
else
|
||||
unset KWIN_DRM_DEVICES
|
||||
echo "redbear-greeter-compositor: DRM device not ready after wait, using virtual compositor backend" >&2
|
||||
exec kwin_wayland_wrapper --virtual
|
||||
exec redbear-compositor --virtual
|
||||
fi
|
||||
|
||||
@@ -228,11 +228,11 @@ else
|
||||
kwin_args+=(--virtual)
|
||||
fi
|
||||
|
||||
kwin_wayland_wrapper "${kwin_args[@]}" &
|
||||
redbear-compositor "${kwin_args[@]}" &
|
||||
kwin_pid=$!
|
||||
|
||||
if ! wait_for_wayland_socket; then
|
||||
printf '%s\n' "redbear-kde-session: kwin_wayland_wrapper failed to expose $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" >&2
|
||||
printf '%s\n' "redbear-kde-session: redbear-compositor failed to expose $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user