diff --git a/local/recipes/kde/kf6-kcolorscheme/recipe.toml b/local/recipes/kde/kf6-kcolorscheme/recipe.toml index cbb83e4c17..30ec1dd14e 100644 --- a/local/recipes/kde/kf6-kcolorscheme/recipe.toml +++ b/local/recipes/kde/kf6-kcolorscheme/recipe.toml @@ -1,7 +1,7 @@ #TODO: KColorScheme — color scheme management. Depends on qtbase, kf6-kconfig, kf6-kcoreaddons, kf6-ki18n, kf6-kguiaddons. [source] -tar = "https://download.kde.org/stable/frameworks/6.24/kcolorscheme-6.24.0.tar.xz" -blake3 = "e80656d02b4c073ab00b481fa0092c2dcf8aa81e482ccbfed8b41210e4b0a941" +tar = "https://download.kde.org/stable/frameworks/6.26/kcolorscheme-6.26.0.tar.xz" +blake3 = "a78ed834939f5a105317834e729093919164cce22783aea69935a67c79fb8b30" [build] template = "custom" @@ -28,6 +28,20 @@ sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \ sed -i '/find_package(Qt6.*Gui)/a find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED)' \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true +# kcolorschemehelpers_p.h uses qApp->property(...).toString() without +# including . Add it. +python3 - <" +s = s.replace(needle, replacement, 1) +with open(p, 'w') as f: + f.write(s) +PYEOF + rm -f CMakeCache.txt rm -rf CMakeFiles diff --git a/local/recipes/kde/kf6-kcoreaddons/recipe.toml b/local/recipes/kde/kf6-kcoreaddons/recipe.toml index ddac2ffb1d..b3ded8df71 100644 --- a/local/recipes/kde/kf6-kcoreaddons/recipe.toml +++ b/local/recipes/kde/kf6-kcoreaddons/recipe.toml @@ -20,10 +20,36 @@ rm -rf CMakeFiles sed -i 's/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/' \ "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true -# Re-enable kfilesystemtype.cpp but provide stub for missing statfs implementation -sed -i 's|#io/kfilesystemtype.cpp|io/kfilesystemtype.cpp|' \ +# kfilesystemtype.cpp uses static determineFileSystemTypeImpl per-platform. +# On Redox (CMAKE_SYSTEM_NAME=Linux) the static branch collides with the +# public function and references statfs magic numbers not present in relibc. +sed -i 's|io/kfilesystemtype.cpp|io/kfilesystemtype_stub.cpp|' \ "${COOKBOOK_SOURCE}/src/lib/CMakeLists.txt" +cat > "${COOKBOOK_SOURCE}/src/lib/io/kfilesystemtype_stub.cpp" << 'EOF' +#include "kfilesystemtype.h" +namespace KFileSystemType +{ +Type fileSystemType(const QString &path) +{ + Q_UNUSED(path); + return Unknown; +} +QString fileSystemName(KFileSystemType::Type type) +{ + Q_UNUSED(type); + return QString(); +} +} +EOF + +# Stub LibMount — Redox has no libmount, but our toolchain sets CMAKE_SYSTEM_NAME=Linux +# so upstream unconditionally tries find_package(LibMount REQUIRED). Disable. +sed -i 's|find_package(LibMount REQUIRED)|find_package(LibMount QUIET)|' \ + "${COOKBOOK_SOURCE}/CMakeLists.txt" +sed -i 's|set(HAVE_LIB_MOUNT ${LibMount_FOUND})|set(HAVE_LIB_MOUNT FALSE)|' \ + "${COOKBOOK_SOURCE}/CMakeLists.txt" + cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \ -DQT_HOST_PATH="${HOST_BUILD}" \ @@ -33,6 +59,7 @@ cmake "${COOKBOOK_SOURCE}" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -DKCOREADDONS_USE_QML=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF \ -DUSE_DBUS=OFF \ -Wno-dev @@ -46,5 +73,5 @@ done """ [source] -tar = "https://download.kde.org/stable/frameworks/6.24/kcoreaddons-6.24.0.tar.xz" -blake3 = "013889a41b20c1c16d01078e265f13178083fb22f91745a4dbb44eafac1e777f" +tar = "https://download.kde.org/stable/frameworks/6.26/kcoreaddons-6.26.0.tar.xz" +blake3 = "abed6c54d5623998f076faeac11be6fd6fef3d10b9e928d09303d812846e3440" diff --git a/local/recipes/kde/kf6-kguiaddons/recipe.toml b/local/recipes/kde/kf6-kguiaddons/recipe.toml index 0cb1076855..9e3f61af85 100644 --- a/local/recipes/kde/kf6-kguiaddons/recipe.toml +++ b/local/recipes/kde/kf6-kguiaddons/recipe.toml @@ -1,7 +1,7 @@ #TODO: KGuiAddons — GUI utilities, color management, text selection. Depends on qtbase, kf6-extra-cmake-modules. Wayland/X11 disabled. [source] -tar = "https://download.kde.org/stable/frameworks/6.24/kguiaddons-6.24.0.tar.xz" -blake3 = "d3e4286f67eeffe4db1aaa4376b09752ae257d441db15016382befbc71c3af9a" +tar = "https://download.kde.org/stable/frameworks/6.26/kguiaddons-6.26.0.tar.xz" +blake3 = "71c65c431228cc9cd8ceb9ba5147ae3e51ba0df57a1c75680032edcba9cecc50" [build] template = "custom" @@ -31,9 +31,10 @@ cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ - -DWITH_WAYLAND=ON \ + -DWITH_WAYLAND=OFF \ -DWITH_X11=OFF \ -DUSE_DBUS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF \ -Wno-dev cmake --build . -j${COOKBOOK_MAKE_JOBS}