Add kded6 recipe and rewrite kirigami for real Qt6Quick build

Phase 4 KDE Plasma preparation:

kded6: new recipe at local/recipes/kde/kf6-kded6/ building the KDE
daemon from source. Depends on kf6-kconfig, kf6-kcoreaddons,
kf6-kcrash, kf6-kdbusaddons, kf6-kservice — all already built.
Added to redbear-full.toml package list. D-Bus activation file
already existed; removed TODO now that recipe exists.

kirigami: rewrite from stub to real CMake build. qtdeclarative
(Qt6Quick) is now available, so the real Kirigami can be built
instead of installing dummy cmake configs and a static lib placeholder.
Added qtshadertools and qtsvg as additional dependencies.
This commit is contained in:
2026-04-25 13:20:33 +01:00
parent 38013bbf16
commit 58edf0df0b
4 changed files with 83 additions and 38 deletions
+1
View File
@@ -72,6 +72,7 @@ kf6-kdeclarative = {}
kf6-kcmutils = {} kf6-kcmutils = {}
kf6-kwayland = {} kf6-kwayland = {}
kdecoration = {} kdecoration = {}
kf6-kded6 = {}
# KWin Wayland compositor # KWin Wayland compositor
kwin = {} kwin = {}
+54
View File
@@ -0,0 +1,54 @@
#TODO: kded6 — KDE daemon for module loading and D-Bus service management.
[source]
tar = "https://invent.kde.org/frameworks/kded/-/archive/v6.10.0/kded-v6.10.0.tar.gz"
[build]
template = "custom"
dependencies = [
"qtbase",
"kf6-extra-cmake-modules",
"kf6-kconfig",
"kf6-kcoreaddons",
"kf6-kcrash",
"kf6-kdbusaddons",
"kf6-kservice",
]
script = """
DYNAMIC_INIT
HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build"
for qtdir in plugins mkspecs metatypes modules; do
if [ -d "${COOKBOOK_SYSROOT}/usr/${qtdir}" ] && [ ! -e "${COOKBOOK_SYSROOT}/${qtdir}" ]; then
ln -s "usr/${qtdir}" "${COOKBOOK_SYSROOT}/${qtdir}"
fi
done
if [ -d "${COOKBOOK_SYSROOT}/usr/plugins" ] && [ ! -e "${COOKBOOK_SYSROOT}/plugins" ]; then
ln -s "usr/plugins" "${COOKBOOK_SYSROOT}/plugins"
fi
sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
cmake "${COOKBOOK_SOURCE}" \
-GNinja \
-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}" \
-DBUILD_TESTING=OFF \
-DBUILD_QCH=OFF \
-Wno-dev
cmake --build . -j${COOKBOOK_MAKE_JOBS}
DESTDIR="${COOKBOOK_STAGE}" cmake --install . --prefix /usr
for lib in "${COOKBOOK_STAGE}/usr/lib/"libKF6*.so.*; do
[ -f "${lib}" ] || continue
patchelf --remove-rpath "${lib}" 2>/dev/null || true
done
"""
+28 -37
View File
@@ -1,4 +1,4 @@
#TODO: Kirigami — QtQuick lightweight UI framework. QML-heavy but required by KDE Plasma. #TODO: Kirigami — QtQuick lightweight UI framework. Required by KDE Plasma.
[source] [source]
tar = "https://invent.kde.org/frameworks/kirigami/-/archive/v6.10.0/kirigami-v6.10.0.tar.gz" tar = "https://invent.kde.org/frameworks/kirigami/-/archive/v6.10.0/kirigami-v6.10.0.tar.gz"
@@ -7,6 +7,8 @@ template = "custom"
dependencies = [ dependencies = [
"qtbase", "qtbase",
"qtdeclarative", "qtdeclarative",
"qtshadertools",
"qtsvg",
"kf6-extra-cmake-modules", "kf6-extra-cmake-modules",
"kf6-kcoreaddons", "kf6-kcoreaddons",
"kf6-ki18n", "kf6-ki18n",
@@ -24,44 +26,33 @@ for qtdir in plugins mkspecs metatypes modules; do
fi fi
done done
STAGE="${COOKBOOK_STAGE}/usr" if [ -d "${COOKBOOK_SYSROOT}/usr/plugins" ] && [ ! -e "${COOKBOOK_SYSROOT}/plugins" ]; then
mkdir -p "${STAGE}/lib/cmake/KF6Kirigami" ln -s "usr/plugins" "${COOKBOOK_SYSROOT}/plugins"
mkdir -p "${STAGE}/lib/cmake/KF6Kirigami2" fi
cat > "${STAGE}/lib/cmake/KF6Kirigami/KF6KirigamiConfig.cmake" << 'EOFCFG' sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \
add_library(KF6::Kirigami INTERFACE IMPORTED) "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
EOFCFG sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
cat > "${STAGE}/lib/cmake/KF6Kirigami/KF6KirigamiConfigVersion.cmake" << 'EOFVER' cmake "${COOKBOOK_SOURCE}" \
set(PACKAGE_VERSION "6.10.0") -GNinja \
set(PACKAGE_VERSION_COMPATIBLE TRUE) -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \
EOFVER -DQT_HOST_PATH="${HOST_BUILD}" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \
-DBUILD_TESTING=OFF \
-DBUILD_QCH=OFF \
-DWITH_X11=OFF \
-DKDE_INSTALL_QMLDIR=/usr/lib/qt6/qml \
-Wno-dev
cat > "${STAGE}/lib/cmake/KF6Kirigami/KF6KirigamiTargets.cmake" << 'EOFTGT' cmake --build . -j${COOKBOOK_MAKE_JOBS}
add_library(KF6::Kirigami INTERFACE IMPORTED) DESTDIR="${COOKBOOK_STAGE}" cmake --install . --prefix /usr
EOFTGT
cat > "${STAGE}/lib/cmake/KF6Kirigami2/KF6Kirigami2Config.cmake" << 'EOFCFG2' for lib in "${COOKBOOK_STAGE}/usr/lib/"libKF6*.so.*; do
add_library(KF6::Kirigami2 INTERFACE IMPORTED) [ -f "${lib}" ] || continue
EOFCFG2 patchelf --remove-rpath "${lib}" 2>/dev/null || true
done
cat > "${STAGE}/lib/cmake/KF6Kirigami2/KF6Kirigami2ConfigVersion.cmake" << 'EOFVER2'
set(PACKAGE_VERSION "6.10.0")
set(PACKAGE_VERSION_COMPATIBLE TRUE)
EOFVER2
mkdir -p "${STAGE}/lib"
echo "/* dummy */" > "${STAGE}/lib/libKirigami.a"
mkdir -p "${STAGE}/share/ECM/kde-modules"
cat > "${STAGE}/share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake" << 'EOFKDE'
macro(kde_configure_git_pre_commit_hook)
endmacro()
macro(ecm_set_disabled_deprecation_versions)
endmacro()
EOFKDE
echo "=== Kirigami stub installation complete ==="
echo "Note: Kirigami is QML-based and cannot be built on Redox without Qt6Quick."
echo "Dummy cmake configs installed for dependency resolution."
""" """
@@ -1,4 +1,3 @@
#TODO: kded6 daemon not yet built for Redox — D-Bus activation will fail until it exists
[D-BUS Service] [D-BUS Service]
Name=org.kde.kded6 Name=org.kde.kded6
Exec=/usr/bin/kded6 Exec=/usr/bin/kded6