vasilito
dc68054305
- Restore 29 recipe symlinks (libdrm, qtbase, dbus, sddm, pipewire, etc.) - Restore 33 patches (KDE, libdrm, mesa, pipewire, sddm, wireplumber) - Restore 20+ local/scripts (audit, lint, test, build helpers) - Restore src/cook/scheduler.rs, status.rs, gnu-config/ - Restore scripts/patch-inclusion-gate.sh, run_mini1.sh, validate-collision-log.sh - Recover TLC source from HEAD (was overwritten by 0.2.3 checkout) - Recover 11 local/docs plans from HEAD (were overwritten) - Recover qt6-wayland-smoke symlink from HEAD - Fix MOTD: remove garbled ASCII art, use clean text - Update version: 0.2.0 -> 0.2.4 in os-release, motd, config - Reduce filesystem_size: 1536 -> 512 MiB - Add ABSOLUTE RULE to AGENTS.md: never delete/ignore packages - Reduce pcid scheme log verbosity: info -> debug
91 lines
2.6 KiB
Diff
91 lines
2.6 KiB
Diff
# Initial migration of the inline sed -i chains in
|
|
# local/recipes/kde/kf6-kcmutils's [build].script to a durable external
|
|
# patch. Captured by local/scripts/migrate-kf6-seds-direct.sh
|
|
# on 2026-06-12T20:43:04+03:00.
|
|
#
|
|
# After applying this patch via cookbook_apply_patches,
|
|
# the recipe's [build].script should call:
|
|
# REDBEAR_PATCHES_DIR="/home/kellito/Builds/RedBear-OS/local/patches/kf6-kcmutils"
|
|
# cookbook_apply_patches "${REDBEAR_PATCHES_DIR}"
|
|
# in place of the sed -i chains that produced these edits.
|
|
|
|
--- ./src/CMakeLists.txt
|
|
+++ ./src/CMakeLists.txt
|
|
@@ -14,15 +14,13 @@
|
|
|
|
|
|
add_subdirectory(core)
|
|
-add_subdirectory(qml)
|
|
-add_subdirectory(quick)
|
|
+#add_subdirectory(qml)
|
|
+#add_subdirectory(quick)
|
|
|
|
########### kcmutils ###############
|
|
set(kcmutils_LIB_SRCS
|
|
kcmoduleloader.cpp
|
|
kcmoduleloader.h
|
|
- kcmoduleqml.cpp
|
|
- kcmoduleqml_p.h
|
|
kcmultidialog.cpp
|
|
kcmultidialog.h
|
|
kcmultidialog_p.h
|
|
@@ -66,12 +64,8 @@
|
|
Qt6::Widgets
|
|
KF6::CoreAddons # KPluginMetaData
|
|
KF6::ConfigWidgets # KPageDialog
|
|
- KF6KCMUtilsQuick # QML KCM class
|
|
PRIVATE
|
|
kcmutils_proxy_model
|
|
- Qt6::Qml
|
|
- Qt6::Quick
|
|
- Qt6::QuickWidgets
|
|
KF6::GuiAddons # KIconUtils
|
|
KF6::I18n
|
|
KF6::ItemViews # KWidgetItemDelegate
|
|
@@ -102,4 +96,4 @@
|
|
DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}"
|
|
)
|
|
|
|
-add_subdirectory(kcmshell)
|
|
+#add_subdirectory(kcmshell)
|
|
--- ./CMakeLists.txt
|
|
+++ ./CMakeLists.txt
|
|
@@ -23,7 +23,7 @@
|
|
include(ECMDeprecationSettings)
|
|
include(ECMMarkNonGuiExecutable)
|
|
include(KDEGitCommitHooks)
|
|
-include(ECMQmlModule)
|
|
+#include(ECMQmlModule)
|
|
include(ECMFindQmlModule)
|
|
include(ECMGenerateQDoc)
|
|
|
|
@@ -57,7 +57,7 @@
|
|
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF6KCMUtilsConfigVersion.cmake"
|
|
SOVERSION 6)
|
|
|
|
-find_package(KF6KIO ${KF_DEP_VERSION} REQUIRED)
|
|
+#find_package(KF6KIO ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF6ItemViews ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF6ConfigWidgets ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF6CoreAddons ${KF_DEP_VERSION} REQUIRED)
|
|
@@ -74,7 +74,7 @@
|
|
ecm_find_qmlmodule(org.kde.kirigami REQUIRED)
|
|
|
|
add_definitions(-DTRANSLATION_DOMAIN=\"kcmutils6\")
|
|
-ki18n_install(po)
|
|
+#ki18n_install(po)
|
|
add_subdirectory(src)
|
|
add_subdirectory(tools)
|
|
if(BUILD_TESTING)
|
|
--- ./KF6KCMUtilsConfig.cmake.in
|
|
+++ ./KF6KCMUtilsConfig.cmake.in
|
|
@@ -6,7 +6,6 @@
|
|
include(CMakeFindDependencyMacro)
|
|
find_dependency(KF6ConfigWidgets "@KF_DEP_VERSION@")
|
|
find_dependency(KF6CoreAddons "@KF_DEP_VERSION@")
|
|
-find_dependency(Qt6Qml "@REQUIRED_QT_VERSION@")
|
|
|
|
if (NOT @BUILD_SHARED_LIBS@)
|
|
find_dependency(Qt6Quick "@REQUIRED_QT_VERSION@")
|
|
|