diff --git a/local/recipes/kde/kf6-karchive/recipe.toml b/local/recipes/kde/kf6-karchive/recipe.toml index 12810775e9..0d9d0298cd 100644 --- a/local/recipes/kde/kf6-karchive/recipe.toml +++ b/local/recipes/kde/kf6-karchive/recipe.toml @@ -1,6 +1,7 @@ #TODO: KArchive — archive reading/writing framework. Depends on qtbase, qtdeclarative, kf6-extra-cmake-modules. [source] -tar = "https://invent.kde.org/frameworks/karchive/-/archive/v6.10.0/karchive-v6.10.0.tar.gz" +tar = "https://download.kde.org/stable/frameworks/6.26/karchive-6.26.0.tar.xz" +blake3 = "28ce30c0195a49eebacc41a4fdf8c02c455856195cb977ac288b55acdb6e8b9a" [build] template = "custom" @@ -40,6 +41,7 @@ cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-Bstatic -llzma -Wl,-Bdynamic" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -DWITH_BZIP2=OFF \ diff --git a/local/recipes/kde/kf6-kded6/recipe.toml b/local/recipes/kde/kf6-kded6/recipe.toml index 05491642b2..3887c9c11e 100644 --- a/local/recipes/kde/kf6-kded6/recipe.toml +++ b/local/recipes/kde/kf6-kded6/recipe.toml @@ -1,6 +1,6 @@ [source] -tar = "https://download.kde.org/stable/frameworks/6.24/kded-6.24.0.tar.xz" -blake3 = "204f04d3af0a73742867339a1c75d9a75dfb777bfaed3f2d4f198fa24a1e441c" +tar = "https://download.kde.org/stable/frameworks/6.26/kded-6.26.0.tar.xz" +blake3 = "229df21e03dcba7870e4d0197e2736dad125175efac6fcd031e9fa8ec4eb8647" [build] template = "custom" @@ -28,11 +28,14 @@ sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \ cmake "${COOKBOOK_SOURCE}" \ -GNinja \ + -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja \ -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};${HOST_BUILD}" \ + -DCMAKE_EXE_LINKER_FLAGS="-lffi -Wl,--copy-dt-needed-entries" \ + -DCMAKE_SHARED_LINKER_FLAGS="-lffi -Wl,--copy-dt-needed-entries" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -Wno-dev diff --git a/local/recipes/kde/kf6-kiconthemes/recipe.toml b/local/recipes/kde/kf6-kiconthemes/recipe.toml index a4c8c39216..67f67a5f74 100644 --- a/local/recipes/kde/kf6-kiconthemes/recipe.toml +++ b/local/recipes/kde/kf6-kiconthemes/recipe.toml @@ -1,7 +1,7 @@ #TODO: KIconThemes — icon theme management. Needs kf6-karchive for icon loading. [source] -tar = "https://download.kde.org/stable/frameworks/6.24/kiconthemes-6.24.0.tar.xz" -blake3 = "451ae1376ca2d274586458cddaf6d9c30aa2f4b9216e24b0ade5d0ca1309d58d" +tar = "https://download.kde.org/stable/frameworks/6.26/kiconthemes-6.26.0.tar.xz" +blake3 = "17c4f2780c07cbc8f540d33dc2b8dca94523a6e4d0be600b4d773319de5f2008" [build] template = "custom" @@ -56,6 +56,12 @@ for lib in "${SYSROOT}/lib/libQt6Svg"*; do fi done +# Cross-compilation workaround: GLESv2 test compile fails. Force-set vars. +export GLESv2_LIBRARY="${SYSROOT}/lib/libGLESv2.so" +export GLESv2_INCLUDE_DIR="${SYSROOT}/include" +export EGL_LIBRARY="${SYSROOT}/lib/libEGL.so" +export EGL_INCLUDE_DIR="${SYSROOT}/include" + cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" \ -DQT_HOST_PATH="${HOST_BUILD}" \ @@ -63,10 +69,18 @@ cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \ -DCMAKE_INSTALL_RPATH="${COOKBOOK_SYSROOT}/lib" \ + -DCMAKE_CXX_VISIBILITY_PRESET=default \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -DBUILD_WITH_QML=OFF \ -DUSE_DBUS=OFF \ + -DHAVE_GLESv2:INTERNAL=ON \ + -DGLESv2_LIBRARY="${SYSROOT}/lib/libGLESv2.so" \ + -DGLESv2_INCLUDE_DIR="${SYSROOT}/include" \ + -DEGL_LIBRARY="${SYSROOT}/lib/libEGL.so" \ + -DEGL_INCLUDE_DIR="${SYSROOT}/include" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--copy-dt-needed-entries" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--copy-dt-needed-entries" \ -Wno-dev cmake --build . -j${COOKBOOK_MAKE_JOBS} diff --git a/local/recipes/kde/kf6-kpackage/recipe.toml b/local/recipes/kde/kf6-kpackage/recipe.toml index 182a23bf2c..a75ebd914e 100644 --- a/local/recipes/kde/kf6-kpackage/recipe.toml +++ b/local/recipes/kde/kf6-kpackage/recipe.toml @@ -1,7 +1,7 @@ #TODO: KPackage — package framework, theme/plugin/installer management. Needs kf6-kservice. [source] -tar = "https://download.kde.org/stable/frameworks/6.24/kpackage-6.24.0.tar.xz" -blake3 = "f573764998bbf5c2eeb7dd2c0a59f6ce054a08265f6ef2e6809e2be675557858" +tar = "https://download.kde.org/stable/frameworks/6.26/kpackage-6.26.0.tar.xz" +blake3 = "b5b5a01adfbe9e806dc72e4d7921eafd25fe684693fc29f3fe1381a64b81b3df" [build] template = "custom" @@ -32,12 +32,24 @@ sed -i '/add_subdirectory(qml)/s/^/#/' "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/de rm -f CMakeCache.txt rm -rf CMakeFiles +export LDFLAGS="${LDFLAGS} -llzma -Wl,--copy-dt-needed-entries -Wl,--allow-shlib-undefined" + +SYSROOT="${COOKBOOK_SYSROOT}" +if [ -f "${SYSROOT}/usr/lib/liblzma.a" ]; then + mkdir -p "${SYSROOT}/lib" + ln -sf liblzma.a "${SYSROOT}/usr/lib/liblzma.so.5" 2>/dev/null || true + cp -f "${SYSROOT}/usr/lib/liblzma.a" "${SYSROOT}/lib/liblzma.a" 2>/dev/null || true + ln -sf liblzma.a "${SYSROOT}/lib/liblzma.so.5" 2>/dev/null || true +fi + cmake "${COOKBOOK_SOURCE}" \ -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}" \ + -DCMAKE_EXE_LINKER_FLAGS="-llzma -Wl,--copy-dt-needed-entries -Wl,--allow-shlib-undefined" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--copy-dt-needed-entries -Wl,--allow-shlib-undefined" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -DBUILD_WITH_QML=OFF \