Skip to content

1.0.13#34

Merged
Johnson-zs merged 3 commits intolinuxdeepin:masterfrom
Johnson-zs:master
Jan 2, 2025
Merged

1.0.13#34
Johnson-zs merged 3 commits intolinuxdeepin:masterfrom
Johnson-zs:master

Conversation

@Johnson-zs
Copy link
Contributor

No description provided.

- Remove all QMake project files (.pro and .pri)
- Add CMakeLists.txt for CMake build system
- Update include paths in source files
- Update .gitignore for CMake related directories
- Add cmake as build dependency in debian/control

Log:
- Upgrade CMake minimum version to 3.16
- Update C++ standard to C++17
- Remove Qt
- Fix std namespace usage in zip.cc

Log:
@github-actions
Copy link

TAG Bot

TAG: 1.0.13
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见:

  1. .gitignore 文件中新增的忽略路径 build/.vscode/.idea/cmake-build-* 可能会影响构建过程,需要确认这些路径是否确实不需要被版本控制。

  2. 3rdparty/libs/encoding/encoding.cpp 文件中,#pragma once 被移除,这可能会影响头文件的包含方式,需要确认是否有其他文件依赖于这种方式。

  3. 3rdparty/libs/fileext/cfb/cfb.cpp 文件中,#include "encoding/encoding.cpp" 被替换为 #include "encoding/encoding.hpp",这可能会导致编译错误,因为 .cpp 文件不应该被包含在 .cpp 文件中。应该改为包含头文件。

  4. 3rdparty/utils/libofd/ofd/Color.h 文件中,注释 // TODO 后面没有具体的待办事项描述,建议添加详细说明。

  5. 3rdparty/utils/libofd/utils/zip.cc 文件中,m_impl = make_unique<Zip::ImplCls>(this); 被替换为 m_impl = std::make_unique<Zip::ImplCls>(this);,这是一个好的实践,因为 std::make_unique 是 C++14 引入的,而 make_unique 是 C++11 引入的。

  6. CMakeLists.txt 文件中,添加了 -fstack-protector-strong-D_FORTITY_SOURCE=1 编译选项,这些选项有助于提高代码的安全性。

  7. PKGBUILD 文件中,makedepends 列表中添加了 cmakepkg-config,这是为了支持使用 CMake 构建项目。

  8. debian/control 文件中,移除了 qtbase5-devqt5-qmake,这是因为项目已经迁移到 CMake,不再需要 Qt。

  9. src/CMakeLists.txt 文件中,添加了 configure_file 命令来生成 pkg-config 文件,这是一个好的实践,因为它可以确保生成的文件与项目的版本和安装路径保持一致。

  10. src/src.pro 文件中,移除了所有与 Qt 相关的配置,这是因为项目已经迁移到 CMake,不再需要 Qt。

总体来说,这些更改提高了代码的安全性、可维护性和可移植性。但是,需要进一步确认一些细节,例如头文件包含方式的变化和构建系统的迁移。

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Johnson-zs, max-lvs

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

@Johnson-zs
Copy link
Contributor Author

/merge

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Jan 2, 2025

This pr cannot be merged! (status: unstable)

@Johnson-zs Johnson-zs merged commit 0d89989 into linuxdeepin:master Jan 2, 2025
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