From 017718bffd37279d2bd60842e0535ff0952f7b10 Mon Sep 17 00:00:00 2001 From: sergio Date: Sun, 12 Jul 2026 07:42:11 -0400 Subject: [PATCH] kde/Capa2: tier-2 KF6 sellado 9/10 (fixes deps + patch Canberra) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sellados: kdbusaddons kitemviews kitemmodels kplotting kcrash kcolorscheme kcompletion kconfigwidgets knotifications. kjobwidgets en vuelo (faltaba dep knotifications). Fixes durables: - SET Qt6-consumer (mesa+libdrm+libxkbcommon+wayland) OBLIGATORIO en TODO framework que use Qt6::Gui/Widgets (Qt6Gui_FOUND=FALSE si falta GLESv2). El subagente lo omitió → batch entero falló. - gettext-tiny (msgmerge) para frameworks con traducciones ki18n (kcolorscheme/kconfigwidgets). - qtdeclarative donde hay Qt6Qml transitivo (kcompletion/kconfigwidgets). - kdbusaddons: WITH_X11=OFF (usaba qtx11extras_p.h de Qt-xcb ausente). - knotifications: patch Canberra REQUIRED→opcional (código ya guarda -DHAVE_CANBERRA; evita el stack de audio alsa/pulse/vorbis). Compila sin sonido, deuda audio diferida. Co-Authored-By: Claude Opus 4.8 --- recipes/incoming-kde/kcolorscheme.toml | 2 +- recipes/incoming-kde/kcompletion.toml | 2 +- recipes/incoming-kde/kconfigwidgets.toml | 2 +- recipes/incoming-kde/kcrash.toml | 2 +- recipes/incoming-kde/kdbusaddons.toml | 5 +++-- recipes/incoming-kde/kitemmodels.toml | 2 +- recipes/incoming-kde/kitemviews.toml | 2 +- recipes/incoming-kde/kjobwidgets.toml | 2 +- .../knotifications-canberra-optional.patch | 18 ++++++++++++++++++ recipes/incoming-kde/knotifications.toml | 9 +++++---- recipes/incoming-kde/kplotting.toml | 2 +- 11 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 recipes/incoming-kde/knotifications-canberra-optional.patch diff --git a/recipes/incoming-kde/kcolorscheme.toml b/recipes/incoming-kde/kcolorscheme.toml index c3aba0ed..bedb6df3 100644 --- a/recipes/incoming-kde/kcolorscheme.toml +++ b/recipes/incoming-kde/kcolorscheme.toml @@ -38,4 +38,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "qtdeclarative", "kconfig", "kguiaddons", "kcoreaddons", "ki18n"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "qtdeclarative", "kconfig", "kguiaddons", "kcoreaddons", "ki18n", "gettext-tiny"] diff --git a/recipes/incoming-kde/kcompletion.toml b/recipes/incoming-kde/kcompletion.toml index 6abe1560..5856a45a 100644 --- a/recipes/incoming-kde/kcompletion.toml +++ b/recipes/incoming-kde/kcompletion.toml @@ -38,4 +38,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "kconfig", "kwidgetsaddons", "kcoreaddons", "kcodecs"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "kconfig", "kwidgetsaddons", "kcoreaddons", "kcodecs", "qtdeclarative"] diff --git a/recipes/incoming-kde/kconfigwidgets.toml b/recipes/incoming-kde/kconfigwidgets.toml index 6854a9ef..ad57d5e6 100644 --- a/recipes/incoming-kde/kconfigwidgets.toml +++ b/recipes/incoming-kde/kconfigwidgets.toml @@ -39,4 +39,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "kconfig", "kcodecs", "kguiaddons", "kwidgetsaddons", "ki18n", "kcoreaddons", "kcolorscheme"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "kconfig", "kcodecs", "kguiaddons", "kwidgetsaddons", "ki18n", "kcoreaddons", "kcolorscheme", "gettext-tiny", "qtdeclarative"] diff --git a/recipes/incoming-kde/kcrash.toml b/recipes/incoming-kde/kcrash.toml index 15e39d4c..b058f0c0 100644 --- a/recipes/incoming-kde/kcrash.toml +++ b/recipes/incoming-kde/kcrash.toml @@ -39,4 +39,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "kcoreaddons"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "kcoreaddons"] diff --git a/recipes/incoming-kde/kdbusaddons.toml b/recipes/incoming-kde/kdbusaddons.toml index a88a22e1..dead8a92 100644 --- a/recipes/incoming-kde/kdbusaddons.toml +++ b/recipes/incoming-kde/kdbusaddons.toml @@ -32,10 +32,11 @@ cmake -B build -G Ninja -Wno-dev \ -DCMAKE_C_COMPILER="$ZW/cc" -DCMAKE_CXX_COMPILER="$ZW/cxx" -DCMAKE_ASM_COMPILER="$ZW/cc" \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=/usr \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF \ - -DBUILD_TESTING=OFF -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_TESTING=OFF -DBUILD_PYTHON_BINDINGS=OFF \ + -DWITH_X11=OFF ''' compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland"] diff --git a/recipes/incoming-kde/kitemmodels.toml b/recipes/incoming-kde/kitemmodels.toml index e0059393..724930c2 100644 --- a/recipes/incoming-kde/kitemmodels.toml +++ b/recipes/incoming-kde/kitemmodels.toml @@ -38,4 +38,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "qtdeclarative"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "qtdeclarative"] diff --git a/recipes/incoming-kde/kitemviews.toml b/recipes/incoming-kde/kitemviews.toml index 006477fe..cd27a915 100644 --- a/recipes/incoming-kde/kitemviews.toml +++ b/recipes/incoming-kde/kitemviews.toml @@ -38,4 +38,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland"] diff --git a/recipes/incoming-kde/kjobwidgets.toml b/recipes/incoming-kde/kjobwidgets.toml index 81235a87..397186d3 100644 --- a/recipes/incoming-kde/kjobwidgets.toml +++ b/recipes/incoming-kde/kjobwidgets.toml @@ -38,4 +38,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "kcoreaddons", "kwidgetsaddons", "kwindowsystem"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "kcoreaddons", "kwidgetsaddons", "kwindowsystem", "knotifications"] diff --git a/recipes/incoming-kde/knotifications-canberra-optional.patch b/recipes/incoming-kde/knotifications-canberra-optional.patch new file mode 100644 index 00000000..e0c32c09 --- /dev/null +++ b/recipes/incoming-kde/knotifications-canberra-optional.patch @@ -0,0 +1,18 @@ +knotifications 6.27 hace find_package(Canberra REQUIRED) para el backend de sonido de las +notificaciones (libcanberra → stack de audio alsa/pulse/vorbis, pesado y no soberano). El código +YA está guardado por -DHAVE_CANBERRA (add_definitions sólo si TARGET Canberra::Canberra existe), +así que quitar el REQUIRED deja compilar el path SIN sonido: Canberra no se halla → HAVE_CANBERRA +indefinido → notificaciones sin audio. Feature de audio diferida (deuda Capa 0 audio). + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,7 +78,7 @@ find_package(KF6Config ${KF_DEP_VERSION} REQUIRED) + + if (NOT APPLE AND NOT ANDROID AND NOT WIN32 AND NOT HAIKU OR (WIN32 AND NOT WITH_SNORETOAST)) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) +- find_package(Canberra REQUIRED) ++ find_package(Canberra) + set_package_properties(Canberra PROPERTIES + PURPOSE "Needed to build audio notification support") + if (TARGET Canberra::Canberra) diff --git a/recipes/incoming-kde/knotifications.toml b/recipes/incoming-kde/knotifications.toml index 4dd9441e..b6ee379e 100644 --- a/recipes/incoming-kde/knotifications.toml +++ b/recipes/incoming-kde/knotifications.toml @@ -1,15 +1,16 @@ # knotifications 6.27.0 — KDE Frameworks 6 (Capa 2 tier-2, ADR 0011). Patrón KF6: dynamic, wrapper zig que # filtra -Wl,--fatal-warnings (ECM lo agrega, zig lo rechaza), CMAKE_PREFIX_PATH=/usr, ECM + qttools + dbus. # Qt6Gui/Qml ⇒ qtdeclarative. Deps KF6: kconfig, kcoreaddons, kguiaddons. -# OJO (revisar en la granja): en Linux el CMakeLists hace find_package(Canberra REQUIRED) sin flag para -# desactivarlo (no existe WITHOUT_SOUND). Sin una receta libcanberra o un patch que lo vuelva opcional, -# el configure FALLARÁ. Se deja sin libcanberra por instrucción; blocker conocido a resolver aparte. +# Canberra (backend de sonido) DESBLOQUEADO con patch: knotifications hace find_package(Canberra REQUIRED) +# incondicional en Linux (sin flag WITHOUT_SOUND), pero el código ya guarda -DHAVE_CANBERRA ⇒ el patch +# quita el REQUIRED y compila sin audio (libcanberra = stack alsa/pulse/vorbis, deuda audio diferida). name = "knotifications" version = "6.27.0" [source] tarball = "https://download.kde.org/stable/frameworks/6.27/knotifications-6.27.0.tar.xz" sha256 = "eeb067fab001dd24735ad56e8ec4808fca76e5ecdf003cf614246c9abe1c3e19" +patches = ["knotifications-canberra-optional.patch"] [build] compiler = "zig-cc" @@ -41,4 +42,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "qtdeclarative", "kconfig", "kcoreaddons", "kguiaddons"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland", "qtdeclarative", "kconfig", "kcoreaddons", "kguiaddons"] diff --git a/recipes/incoming-kde/kplotting.toml b/recipes/incoming-kde/kplotting.toml index de7b0de1..b48988da 100644 --- a/recipes/incoming-kde/kplotting.toml +++ b/recipes/incoming-kde/kplotting.toml @@ -38,4 +38,4 @@ compile = "cmake --build build" install = "DESTDIR=/out cmake --install build" [deps] -build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools"] +build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "mesa", "libdrm", "libxkbcommon", "wayland"]