From 88ef1a5dd87060eba6408641d55c5ea46278de1a Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 2 Sep 2026 16:31:52 +0800 Subject: [PATCH] chore: sync prelaunch splash protocol to unstable-v2 upstream file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit treeland-protocols renamed the canonical v2 protocol file to treeland-prelaunch-splash-unstable-v2.xml. Point the Qt wayland client code generation and the helper include at the new file. The wire protocol and create_splash signature are unchanged. treeland-protocols 将规范 v2 协议文件改名为 treeland-prelaunch-splash-unstable-v2.xml，将 Qt wayland 客户端代码 生成与 helper 头文件指向新文件。线协议及 create_splash 签名不变。 Log: 同步预启动闪屏协议到上游 unstable-v2 文件 PMS: TASK-395091 Influence: 构建改用当前 treeland-protocols v2 协议文件，wayland 客户端绑定与上游一致；运行期行为不变。 --- CMakeLists.txt | 2 +- src/dbus/CMakeLists.txt | 2 +- src/dbus/prelaunchsplashhelper.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1e5a466..716a707f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10) endif() find_package(Dtk6 REQUIRED COMPONENTS Core) find_package(Threads REQUIRED) -find_package(TreelandProtocols REQUIRED) +find_package(TreelandProtocols 0.6.0 REQUIRED) # Check if dde-api provides EventLogger (header-only) find_package(DDEAPI QUIET) 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..f3e0ea69 100644 --- a/src/dbus/prelaunchsplashhelper.h +++ b/src/dbus/prelaunchsplashhelper.h @@ -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;