Skip to content

Conversation

@lichaofan2008
Copy link
Contributor

Adapted to the v20 system, issues of buildpackage on Qt5.
适配v20系统,完成Qt5环境的打包流程。

v20 BUG 分支合一到v25主线
Task: https://pms.uniontech.com/task-view-383475.html

@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control.in,debian/control,debian/rules

@github-actions
Copy link

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 38,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control.in,debian/control,debian/rules

@github-actions
Copy link

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 52,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control.in,debian/control,debian/rules

@github-actions
Copy link

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 37,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control.in,debian/control,debian/rules

@github-actions
Copy link

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 37,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control.in,debian/control,debian/rules

@github-actions
Copy link

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 37,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

Adapted to the v20 system, issues of buildpackage on Qt5.
适配v20系统,完成Qt5环境的打包流程。

v20 BUG 分支合一到v25主线
Task: https://pms.uniontech.com/task-view-383475.html
@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control.in,debian/control,debian/rules

@deepin-ci-robot
Copy link

deepin pr auto review

我来对这个 Git diff 进行详细的代码审查:

  1. 语法逻辑:
  • debian/control 文件中的依赖关系修改使用了 | (或) 操作符来支持 Qt5 和 Qt6 的兼容性,这是符合 Debian 包管理语法的。
  • debian/rules 文件中定义的 check_qt_version 函数使用了 shell 命令和条件判断,语法正确。
  • CMakeLists.txt 文件中的条件判断逻辑清晰,避免了重复包含。
  1. 代码质量:
    优点:
  • 使用了条件编译来支持多个 Qt 版本,提高了代码的灵活性
  • debian/control.in 的引入使得包配置更加清晰和可维护
  • 删除了冗余的 Qt5/Qt6 特定包定义,改用更通用的方式

改进建议:

  • debian/rules 中的 check_qt_version 函数可以考虑添加更多的错误处理
  • 建议在 debian/control.in 中添加版本说明注释,方便维护者理解不同版本的支持情况
  1. 代码性能:
  • 使用条件编译避免了不必要的依赖检查,这是好的实践
  • debian/rules 中的版本检测在构建时只执行一次,不会影响运行时性能
  1. 代码安全:
    优点:
  • 使用了标准的 Debian 包管理机制
  • 依赖关系明确,避免了潜在的冲突

改进建议:

  • debian/control 中的依赖关系使用了 | 操作符,建议添加版本号限制,例如:
    qt6-base-dev (>= 6.0) | qtbase5-dev (>= 5.12)
    
  • debian/rules 中的 shell 命令应该使用绝对路径,例如:
    /bin/echo "Checking OS version..." >&2
  1. 其他建议:
  • 考虑添加构建日志记录,方便调试版本选择问题
  • 建议在文档中说明 Qt5 和 Qt6 的具体差异和迁移指南
  • 可以考虑添加自动化测试来验证不同 Qt 版本的兼容性

总体来说,这个改动是合理的,它实现了 Qt5 和 Qt6 的兼容性支持,同时保持了代码的清晰和可维护性。主要的改进空间在于版本限制和错误处理的加强。

@github-actions
Copy link

  • 敏感词检查失败, 检测到1个文件存在敏感词
详情
{
    "debian/control": [
        {
            "line": "Homepage: http://www.deepin.org",
            "line_number": 37,
            "rule": "S35",
            "reason": "Url link | 6fe814dfb7"
        }
    ]
}

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: lichaofan2008, lzwind

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

@lichaofan2008
Copy link
Contributor Author

/forcemerge

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 24, 2025

This pr force merged! (status: unstable)

@deepin-bot deepin-bot bot merged commit a7e0c4a into linuxdeepin:master Dec 24, 2025
17 of 20 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