From 7048f53540fbac91f6656eba8c31bf98bc29a5f6 Mon Sep 17 00:00:00 2001 From: zhangkun Date: Tue, 8 Sep 2026 14:25:36 +0800 Subject: [PATCH 1/2] chore(dbus): follow treeland prelaunch splash protocol rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Rename prelaunch splash protocol reference to unstable-v2 naming 2. Update generated Qt Wayland header include accordingly 3. Protocol interface names are unchanged, only the file name changed Log: Track the renamed treeland-prelaunch-splash-unstable-v2 protocol Influence: Builds against the renamed protocol; no behavior change chore(dbus): 跟进 treeland 预启动闪屏协议改名 1. 协议文件引用改为 unstable-v2 命名 2. 同步更新生成的 Qt Wayland 头文件引用 3. 协议接口名未变，仅文件名变化 Log: 对接改名为 treeland-prelaunch-splash-unstable-v2 的协议 PMS: TASK-395345 Influence: 适配协议改名，行为无变化 Change-Id: Ibf2bb08151fd6a49f4aa05366d38ea5476627391 --- src/dbus/CMakeLists.txt | 2 +- src/dbus/prelaunchsplashhelper.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index dce45f70..7a2efcc6 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -21,7 +21,7 @@ endif() qt_generate_wayland_protocol_client_sources(dde_am_dbus FILES - ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-prelaunch-splash-v2.xml + ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-prelaunch-splash-unstable-v2.xml ) target_sources(dde_am_dbus PRIVATE diff --git a/src/dbus/prelaunchsplashhelper.h b/src/dbus/prelaunchsplashhelper.h index a105ed81..2d8144dd 100644 --- a/src/dbus/prelaunchsplashhelper.h +++ b/src/dbus/prelaunchsplashhelper.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2025-2026 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2025 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later @@ -13,7 +13,7 @@ #include #include -#include "qwayland-treeland-prelaunch-splash-v2.h" +#include "qwayland-treeland-prelaunch-splash-unstable-v2.h" // Wayland C types struct wl_buffer; From d9560cbd75bdf08fec2d7cfddeb5e2c9ba1a72b2 Mon Sep 17 00:00:00 2001 From: zhangkun Date: Tue, 8 Sep 2026 14:33:42 +0800 Subject: [PATCH 2/2] build: require treeland-protocols (>> 0.5.10) for renamed protocol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Add a version floor (strictly greater than 0.5.10) to Build-Depends on treeland-protocols 2. Ensures the renamed treeland-prelaunch-splash-unstable-v2.xml is present 3. Avoids CMake failure against older packages shipping the old file name Log: Require treeland-protocols (>> 0.5.10) for the renamed prelaunch splash protocol Influence: Outdated treeland-protocols rejected at package resolution time build: 依赖 treeland-protocols (>> 0.5.10) 支持改名协议 1. Build-Depends 中 treeland-protocols 增加版本下限（>> 0.5.10） 2. 确保包含改名后的 treeland-prelaunch-splash-unstable-v2.xml 3. 避免旧包缺少新文件名导致构建失败 Log: 要求 treeland-protocols (>> 0.5.10) 以支持改名后的预启动闪屏协议 PMS: TASK-395345 Influence: 旧版 treeland-protocols 在依赖解析阶段即被排除 Change-Id: Id0db3235f56d10d250d911002c345937de5f9c94 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 22c27dc7..efe30819 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat ( =12), cmake, qt6-base-dev, libdtkcommon-dev, libdtk6core-dev (>= 6.7.41), - treeland-protocols, + treeland-protocols (>> 0.5.10), qt6-wayland-dev, qt6-base-private-dev, qt6-wayland-private-dev,