Conversation
Find the module dtk6widget by `.cmake` instead of an invalid `.pc` file. An invalid include path "/usr/include/dtk6/DWidget/dtk6/DWidget" is provided in the `.pc` file, which will cause the compiler to fail to read the DWidget header file. Use `dtk_add_config_meta_files` instead of `dconfig_meta_files` when the DTK major version is 6. Log: Fix build fail
As title. Log: Bump version to 6.5.38
|
TAG Bot TAG: 6.5.38 |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideAdjusts CMake configuration to properly find and link DTK components for Qt builds, updates DConfig handling for DTK 6, and bumps the application version across Linglong packaging files. Flow diagram for updated DConfig handling based on DTK versionflowchart TD
A[Configure build] --> B{DTK_VERSION EQUAL 6}
B -- Yes --> C[Call dtk_add_config_meta_files
APPID org.deepin.camera
FILES org.deepin.camera.encode.json]
B -- No --> D[Install org.deepin.camera.encode.json
to CMAKE_INSTALL_DATADIR/dsg/configs/org.deepin.camera]
C --> E[Build and install application]
D --> E[Build and install application]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- You are linking against
Dtk${DTK_VERSION}::Corebut only callfind_package(Dtk${DTK_VERSION}Widget REQUIRED); consider adding an appropriatefind_package(orCOMPONENTS Core Widget) so that theCoretarget is guaranteed to be defined. - The condition
if (DTK_VERSION EQUAL "6")is doing a numeric comparison on a string literal; usingif (DTK_VERSION STREQUAL "6")(or a more flexible version check) would be clearer and avoid unexpected behavior ifDTK_VERSIONis not purely numeric. - The previous
if (DEFINED DSG_DATA_DIR)block for DConfig setup has been replaced with a hard DTK6 check; if you still need to support other DTK versions or configurations, consider preserving or refactoring that logic instead of dropping it outright.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- You are linking against `Dtk${DTK_VERSION}::Core` but only call `find_package(Dtk${DTK_VERSION}Widget REQUIRED)`; consider adding an appropriate `find_package` (or `COMPONENTS Core Widget`) so that the `Core` target is guaranteed to be defined.
- The condition `if (DTK_VERSION EQUAL "6")` is doing a numeric comparison on a string literal; using `if (DTK_VERSION STREQUAL "6")` (or a more flexible version check) would be clearer and avoid unexpected behavior if `DTK_VERSION` is not purely numeric.
- The previous `if (DEFINED DSG_DATA_DIR)` block for DConfig setup has been replaced with a hard DTK6 check; if you still need to support other DTK versions or configurations, consider preserving or refactoring that logic instead of dropping it outright.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
deepin pr auto review这份 Git diff 主要涉及 以下是对该 diff 的详细审查意见,分为版本号、构建逻辑和代码质量三个方面: 1. 版本号与变更日志
2. 构建逻辑与依赖管理 (CMakeLists.txt)这是本次修改的核心部分,主要涉及 DTK (Deepin Tool Kit) 的查找和链接方式的变更。
3. 代码质量与安全性
总结与建议
总体而言,这是一次针对构建系统的合理重构,旨在修复构建失败并规范化依赖管理。 |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: lzwind, wangrong1069 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot ✅ Tag created successfully 📋 Tag Details
|
Summary by Sourcery
Adjust build configuration to properly link DTK components and update package versions.
Bug Fixes:
Build:
Deployment: