From e12cbaf61bc931d1baffc8d0227fe394a7f841e2 Mon Sep 17 00:00:00 2001 From: yeshanshan Date: Mon, 12 Oct 2026 10:58:44 +0800 Subject: [PATCH 1/2] chore: update DTL version to 2.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Change DTL_VERSION from "2.0.99" to "2.0.0" in CMakeLists.txt 2. This updates the project version definition used by the CMake build system 3. The version string is stored as a CACHE STRING and consumed elsewhere in the build to set the project version Influence: 1. Verify the CMake configuration completes without errors 2. Confirm the generated project version reflects 2.0.0 3. Check that dependent packaging scripts consuming DTL_VERSION still work correctly 4. Ensure no build artifacts or metadata still reference the previous version 2.0.99 chore: 将 DTL 版本更新为 2.0.0 1. 在 CMakeLists.txt 中将 DTL_VERSION 从 "2.0.99" 修改为 "2.0.0" 2. 该变更更新了 CMake 构建系统所使用的项目版本定义 3. 版本字符串以 CACHE STRING 形式存储，并在构建过程中被用于设置项目版本 Influence: 1. 验证 CMake 配置能够无错误完成 2. 确认生成的项目版本反映为 2.0.0 3. 检查依赖 DTL_VERSION 的打包脚本仍能正常工作 4. 确保没有构建产物或元数据仍引用旧版本 2.0.99 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3960a91e..15b3f41d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.16) cmake_policy(SET CMP0160 OLD) -set(DTL_VERSION "2.0.99" CACHE STRING "Define project version") +set(DTL_VERSION "2.0.0" CACHE STRING "Define project version") set(DOCK_VERSION "6.0.37" CACHE STRING "Dock compatible version") project(dde-tray-loader From 4f9fdcc2d149187c5a35165f3adae4879d213954 Mon Sep 17 00:00:00 2001 From: yeshanshan Date: Fri, 21 Aug 2026 11:18:29 +0800 Subject: [PATCH 2/2] chore: update pkg-config include path for tray loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Change the includedir variable in dde-tray-loader.pc.in from `@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-tray-loader` to `@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock` 2. This corrects the actual installation directory where the tray plugin development headers are placed 3. Ensures pkg-config consumers can successfully locate and include the correct header files Influence: 1. Verify that `pkg-config --cflags dde-tray-loader` returns the updated include path pointing to `dde-dock` 2. Test building a sample program that uses the tray plugin headers via pkg-config 3. Ensure that consumer packages depending on this pc file can compile without header resolution errors chore: 更新托盘加载器的 pkg-config 包含路径 1. 将 dde-tray-loader.pc.in 中的 includedir 变量 从 `@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-tray-loader` 改为 `@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock` 2. 修正了托盘插件开发头文件实际安装目录的配置 3. 确保使用 pkg-config 的消费者能够正确定位并引用正确的头文件 Influence: 1. 验证 `pkg-config --cflags dde-tray-loader` 返回的包含路径指向 `dde- dock` 2. 测试通过 pkg-config 使用托盘插件头文件构建示例程序的过程 3. 确保依赖此 pc 文件的消费者包能够正常编译，无头文件解析错误 --- dde-tray-loader.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dde-tray-loader.pc.in b/dde-tray-loader.pc.in index 0c8e5e24a..4b46d358a 100644 --- a/dde-tray-loader.pc.in +++ b/dde-tray-loader.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-tray-loader +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock Name: dde-tray-loader Description: tray plugin dev header for deepin