Skip to content

chore: update pkg-config include path for tray loader - #496

Merged
18202781743 merged 2 commits into
linuxdeepin:masterfrom
18202781743:master
Oct 12, 2026
Merged

18202781743 merged 2 commits into
linuxdeepin:masterfrom
18202781743:master

Conversation

@18202781743

@18202781743 18202781743 commented Aug 21, 2026 •

Copy link
Copy Markdown
Contributor
  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 文件的消费者包能够正常编译,无头文件解析错误

Summary by Sourcery

Fix the tray loader pkg-config metadata and align the project version with the intended release.

Bug Fixes:

  • Correct the tray loader pkg-config include path so consumers locate the installed development headers under the dock include directory.

Build:

  • Update the tray loader project version from 2.0.99 to 2.0.0.

@sourcery-ai

sourcery-ai Bot commented Aug 21, 2026

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Updates the pkg-config template for dde-tray-loader so that the advertised include directory matches the actual dde-dock header installation path, ensuring consumers can find the tray plugin development headers correctly.

File-Level Changes

Change Details Files
Correct pkg-config includedir for dde-tray-loader to point to the dde-dock headers directory used at install time.
  • Update the includedir definition to use @CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock instead of @CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-tray-loader so pkg-config --cflags reports the real header path
  • Align the pkg-config metadata with the actual installation layout of tray plugin development headers to avoid header resolution errors for downstream builds
dde-tray-loader.pc.in

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

BLumia
BLumia previously approved these changes Aug 21, 2026
@deepin-bot

deepin-bot Bot commented Sep 10, 2026

Copy link
Copy Markdown

TAG Bot

New tag: 2.0.40
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #506

@deepin-bot

deepin-bot Bot commented Sep 22, 2026

Copy link
Copy Markdown

TAG Bot

New tag: 2.0.41
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #520

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 18202781743, BLumia

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

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
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 文件的消费者包能够正常编译,无头文件解析错误
@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

🤖 AI 代码审查报告

总体评分: 100 分 (通过阈值: 70分)

Pass


📊 总体评价

项目 结果
审查结论 代码审查通过
评分详情 总体评分 100 分,大于 70 分通过阈值,代码质量符合要求。本次变更修改了 2 个文件:CMakeLists.txt 中将项目版本从 2.0.99 更新为 2.0.0(正式发布版本),dde-tray-loader.pc.in 中将 includedir 从 dde-tray-loader 修正为 dde-dock 以匹配实际的头文件安装目录(CMakeLists.txt 第70行 interfaces/*.h 安装到 dde-dock 目录)。两处修改均为配置值变更,语法正确,逻辑合理,无安全风险。

🔍 详细分析

1. 语法逻辑 ✅

评价: 优秀 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: 语法正确,逻辑清晰。CMakeLists.txt 中 set(DTL_VERSION "2.0.0" CACHE STRING "Define project version") 语法正确,版本号格式合法。dde-tray-loader.pc.in 中 includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock 使用了标准的 CMake 变量替换语法,pkg-config 模板格式正确。includedir 路径变更与 CMakeLists.txt 第70行 install(FILES ${INTERFACES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dde-dock) 保持一致,逻辑正确。


2. 代码质量 ✅

评价: 优秀 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: 代码结构清晰,注释完整。变更内容简洁明确,仅修改了两个配置值。Commit message 提供了详细的中英文双语说明,包括变更原因和影响分析。CMakeLists.txt 中的 systemd 配置部分有清晰的注释说明。变更风格与现有代码保持一致。


3. 代码性能 ✅

评价: 优秀 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: 性能良好,资源使用合理。本次变更仅为构建配置值的修改,不涉及任何算法、数据处理或资源分配逻辑,对运行时性能无任何影响。


4. 代码安全 🔒

评价: 优秀 ✅ 通过

🔐 发现 0 个安全漏洞

安全漏洞详情:
✅ 未发现安全漏洞

建议: 存在0个安全漏洞。本次变更不涉及用户输入处理、敏感信息存储、权限控制等安全相关逻辑。版本号更新和 include 路径修正均为静态配置值变更,不引入任何安全风险。


💡 改进建议代码示例

// 本次变更无需改进,代码已符合规范
// CMakeLists.txt:
set(DTL_VERSION "2.0.0" CACHE STRING "Define project version")

// dde-tray-loader.pc.in:
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock

本报告由 AI 代码审查工具自动生成

@18202781743
18202781743 merged commit 99ab6d4 into linuxdeepin:master Oct 12, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants