Skip to content

Merge packaging & Release 0.0.16 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
BLumia merged 5 commits into from
Aug 25, 2025
Merged

Merge packaging & Release 0.0.16 #41

BLumia merged 5 commits into from
Aug 25, 2025

Conversation

@UTsweetyfish
Copy link
Member

@UTsweetyfish UTsweetyfish commented Aug 21, 2025 •
edited
Loading

  • Merge packaging
  • Bump version to 0.0.16 in archlinux/PKGBUILD and CMakeLists.txt
  • Declare Breaks and Replaces against libgio-qt (<= 0.0.14)
  • Drop libgio-qt-doc
  • Release to unstable

@github-actions
Copy link

github-actions bot commented Aug 21, 2025

TAG Bot

TAG: 0.0.16
EXISTED: no
DISTRIBUTION: unstable

@UTsweetyfish UTsweetyfish changed the title merge packaging Merge packaging & Release 0.0.16 Aug 21, 2025
BLumia
BLumia reviewed Aug 21, 2025
View reviewed changes
Copy link
Member

@BLumia BLumia left a comment

Choose a reason for hiding this comment

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

四个commit要原样保留吗？如果要的话，commit格式不合规，不要的话我 squash 合并的时候可以修改掉。

CMakeLists.txt
set (DOXYGEN_QHG_LOCATION "qhelpgenerator")
set (DOXYGEN_QHP_NAMESPACE "org.deepin.gio-qt")
set (DOXYGEN_QCH_FILE "../gio-qt.qch")
#set (DOXYGEN_QCH_FILE "../gio-qt.qch")
Copy link
Member

@BLumia BLumia Aug 21, 2025

Choose a reason for hiding this comment

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

这个是为啥去掉的

Copy link
Member Author

@UTsweetyfish UTsweetyfish Aug 21, 2025

Choose a reason for hiding this comment

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

不知道，我 as-is 照搬的
deepin-community/gio-qt#2

Copy link
Member Author

@UTsweetyfish UTsweetyfish Aug 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

可以留着？要留着吗？

Copy link
Member

@BLumia BLumia Aug 25, 2025

Choose a reason for hiding this comment

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

这个和下面那个应该是出qch文档（-doc包）用的，现在我看-doc包已经去掉了，相当于不会生成文档。。

@deepin-ci-robot
Copy link

deepin-ci-robot commented Aug 21, 2025

deepin pr auto review

根据提供的git diff，我来分析一下这个版本的更新内容和潜在问题：

  1. 版本更新：
  • 版本号从0.0.14升级到0.0.16
  • Arch Linux和Debian包都已更新到新版本
  1. 主要变更：
  • CMakeLists.txt中版本号更新
  • 文档生成相关配置被注释掉
  • Debian包结构发生重大变化：
    • 分离了Qt5和Qt6的库包
    • 添加了Breaks和Replaces声明
    • 删除了compat文件
    • 更新了build依赖
  1. 代码质量和改进建议：

a) CMakeLists.txt：

# 原代码
set(DOXYGEN_QCH_FILE "../gio-qt.qch")
#set (DOXYGEN_QCH_FILE "../gio-qt.qch")
  • 改进建议：如果文档生成功能被禁用，应该考虑完全移除相关配置，而不是仅仅注释掉。这可以减少配置文件的复杂性。

b) debian/control：

Package: libgio-qt-dev
Depends:
 libgio-qt0 (= ${binary:Version}),
 libgio-qt6-0 (= ${binary:Version}),
  • 改进建议：这里同时依赖Qt5和Qt6版本的库可能会导致不必要的依赖冲突。建议考虑：
    • 分离开发包为libgio-qt5-dev和libgio-qt6-dev
    • 或者提供一个元包来处理依赖关系

c) debian/rules：

export QT_SELECT = qt5
  • 改进建议：这个设置被移除了，这是正确的，因为现在同时支持Qt5和Qt6。但需要确保构建系统能正确处理多Qt版本的情况。
  1. 安全性考虑：

a) 版本兼容性：

  • 添加了Breaks和Replaces声明是好的做法，可以确保平滑升级
  • 但需要确保这些声明准确反映了实际的API变化

b) 依赖管理：

  • 新的依赖结构更加清晰，但需要确保：
    • 所有必要的依赖都已声明
    • 没有过度的依赖
    • 版本约束合理
  1. 性能考虑：
  • 分离Qt5和Qt6的包是合理的，可以减少不必要的库加载
  • 需要确保两个版本不会产生冲突
  1. 其他建议：

a) 文档：

  • 注释掉了QCH文件的生成和安装
  • 建议考虑：
    • 要么完全移除文档构建配置
    • 要么重新启用并完善文档构建流程

b) 版本控制：

  • 建议在changelog中更详细地说明0.0.15和0.0.16之间的具体变更
  • 考虑使用语义化版本控制规范来管理版本号

c) 构建系统：

  • 考虑添加构建测试的步骤
  • 确保在CI/CD流程中测试所有支持的Qt版本

总体来说，这次更新主要是为了支持多Qt版本并改进包结构。主要的改进点是分离Qt5和Qt6的支持，但需要确保这种分离不会给用户带来不便。建议在发布前进行充分的测试，特别是在混合使用Qt5和Qt6的应用场景下。

@UTsweetyfish
Copy link
Member Author

UTsweetyfish commented Aug 21, 2025

四个commit要原样保留吗？如果要的话，commit格式不合规，不要的话我 squash 合并的时候可以修改掉。

我看看改下 commit 格式？

@BLumia
Copy link
Member

BLumia commented Aug 21, 2025 •
edited
Loading

四个commit要原样保留吗？如果要的话，commit格式不合规，不要的话我 squash 合并的时候可以修改掉。

我看看改下 commit 格式？

要保留的话，改吧。

type: short description

detail desciption

Log:

这种格式。commitlint 也是按这个检查的。

@UTsweetyfish
packaging: merge packaging
70cf4ae 
- Update debian/changelog to 0.0.16
- Split Qt5/Qt6 library packages: libgio-qt0 & libgio-qt6-0
- Replace deprecated debian/compat with debhelper-compat (= 13)
- Refresh d/control and d/rules
- Drop obsolete .qch documentation installation
  deepin-community/gio-qt#2
- Add proper Multi-Arch, copyright and docs handling
@UTsweetyfish
chore: bump version to 0.0.16 in CMakeLists.txt and archlinux/PKGBUILD
24cd056 
Synchronize the hard-coded version strings:
- CMakeLists.txt: update PROJECT_VERSION default from 0.0.1 to 0.0.16
- archlinux/PKGBUILD: update pkgver from 0.0.14 to 0.0.16
@UTsweetyfish
fix: declare Breaks/Replaces against libgio-qt <= 0.0.14
6df798a 
Added Breaks and Replaces relations against the legacy libgio-qt binary
packages (version 0.0.14 and earlier) to all three binary packages
(libgio-qt-dev, libgio-qt5-0, libgio-qt6-0).
@UTsweetyfish
chore: Drop libgio-qt-doc package
703482b 
Remove the libgio-qt-doc binary package from the build. It's already an
empty package.
@UTsweetyfish
chore: Release version 0.0.16 to unstable
fd96df5 
Update changelog
@UTsweetyfish UTsweetyfish requested a review from BLumia August 22, 2025 02:13
@UTsweetyfish
Copy link
Member Author

UTsweetyfish commented Aug 22, 2025

qch 的变更要 revert 掉吗？

BLumia
BLumia approved these changes Aug 25, 2025
View reviewed changes
Copy link
Member

@BLumia BLumia left a comment

Choose a reason for hiding this comment

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

文档回头有人有空再说吧。。

@deepin-ci-robot
Copy link

deepin-ci-robot commented Aug 25, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

@BLumia BLumia merged commit f4661fa into linuxdeepin:master Aug 25, 2025
17 checks passed
@deepin-bot deepin-bot bot mentioned this pull request Aug 25, 2025
Open
@UTsweetyfish
Copy link
Member Author

UTsweetyfish commented Sep 11, 2025

/integrate

@deepin-community-ci-bot deepin-community-ci-bot bot mentioned this pull request Sep 11, 2025
Open
@github-actions
Copy link

github-actions bot commented Sep 11, 2025

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#3226
PrNumber: 3226
PrBranch: auto-integration-17637216740

@Zeno-sole
Copy link
Contributor

Zeno-sole commented Sep 11, 2025

本次集成关闭，后续由成都方面发起集成

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BLumia BLumia BLumia approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@UTsweetyfish @deepin-ci-robot @BLumia @Zeno-sole