sergio/takana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde/Capa1: quitar qtwayland.toml redundante (qtbase ya bundlea Qt6WaylandClient)

Browse Source 
Verificado: el artefacto qtbase contiene libQt6WaylandClient.so.6.11.1 (14.8MB real) +
Qt6WaylandClientConfig.cmake + plugins QPA wayland completos. kwindowsystem selló contra el
bundled. Una receta qtwayland separada duplicaría la .so (colisión de proveedor). Revierto la
dep espuria en kwindowsystem (mantiene su hash sellado 29265422).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
sergio
2026-07-12 07:12:47 -04:00
co-authored by Claude Opus 4.8
parent a25c46a41c
commit 4ed01d0e91
2 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/incoming-kde/kwindowsystem.toml
+3 -2
View File
@@ -38,7 +38,8 @@ compile = "cmake --build build"
install = "DESTDIR=/out cmake --install build"
[deps]
# WAYLAND-ONLY (WITH_X11=OFF): el path X11 pedía XCB con KEYSYMS/RES/ICCCM + Qt-xcb (deuda Capa 0
# WAYLAND-ONLY (KWINDOWSYSTEM_X11=OFF): el path X11 pedía XCB con KEYSYMS/RES/ICCCM + Qt-xcb (deuda Capa 0
# diferida). Plasma es Wayland-first. plasma-wayland-protocols p/ find_package(PlasmaWaylandProtocols).
# Qt6WaylandClient bundleado en qtbase. Las recetas xcb-util-* quedan selladas para cuando se salde Qt-xcb.
# Qt6WaylandClient viene BUNDLEADO en qtbase (libQt6WaylandClient.so.6.11.1 + Qt6WaylandClientConfig.cmake
# dentro del artefacto qtbase, verificado) ⇒ NO se necesita receta qtwayland separada (duplicaría la .so).
build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "dbus", "extra-cmake-modules", "qttools", "qtdeclarative", "mesa", "libdrm", "libxkbcommon", "wayland", "wayland-protocols", "plasma-wayland-protocols"]
recipes/incoming-kde/qtwayland.toml
-37
View File
@@ -1,37 +0,0 @@
# qt6-qtwayland 6.11.1 — QtWaylandClient + QtWaylandCompositor. Capa 1 campaña KDE (ADR 0011): provee
# Qt6WaylandClient que kwindowsystem (backend Wayland) y todo Plasma-on-Wayland (kwin/plasmashell) exigen,
# + el QPA wayland del lado cliente. Patrón módulo Qt (dinámico, wrappers zig, Qt6 sellado vía PREFIX_PATH).
# Set Qt-consumer (mesa/libdrm/libxkbcommon) + wayland + wayland-protocols (wayland-scanner genera código).
name = "qt6-qtwayland"
version = "6.11.1"
[source]
tarball = "https://download.qt.io/official_releases/qt/6.11/6.11.1/submodules/qtwayland-everywhere-src-6.11.1.tar.xz"
sha256 = "95788aa502f75441d4edf65932b235f76523084e13dbbb7b9ee2d207b32bd9b3"
[build]
compiler = "zig-cc"
target = "x86_64-linux-musl"
link = "dynamic"
flags = []
[build.phases]
configure = '''
ZW="$PWD/.zwrap"; mkdir -p "$ZW"
printf '#!/bin/sh\nexec /opt/zig/zig cc -mcpu=baseline "$@"\n' > "$ZW/cc"
printf '#!/bin/sh\nexec /opt/zig/zig c++ -mcpu=baseline "$@"\n' > "$ZW/cxx"
chmod +x "$ZW/cc" "$ZW/cxx"
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_INTERPROCEDURAL_OPTIMIZATION=OFF -DCMAKE_PREFIX_PATH=/usr \
-DINSTALL_BINDIR=lib/qt6/bin -DINSTALL_PUBLICBINDIR=bin -DINSTALL_LIBEXECDIR=lib/qt6/libexec \
-DINSTALL_ARCHDATADIR=lib/qt6 -DINSTALL_DATADIR=share/qt6 -DINSTALL_INCLUDEDIR=include/qt6 \
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
-DQT_BUILD_EXAMPLES=OFF -DQT_BUILD_TESTS=OFF
'''
compile = "cmake --build build"
install = "DESTDIR=/out cmake --install build"
[deps]
build = ["cmake", "samurai", "python3", "pkgconf", "qtbase", "qtdeclarative", "mesa", "libdrm", "libxkbcommon", "wayland", "wayland-protocols"]