Skip to content

refactor: Remove pzip plugin and update CMake configuration #353

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

Merged
deepin-bot merged 1 commit into from
Jan 20, 2026
Merged

refactor: Remove pzip plugin and update CMake configuration #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions 3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ add_subdirectory(libzipplugin)

add_subdirectory(libminizipplugin)

# pzip 高性能并行压缩工具（仅 x86/ARM + Qt6 环境启用）
# clipzipplugin（仅 x86/ARM + Qt6 环境启用，依赖 src/pzip）
if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm|x86_64|amd64") AND (QT_VERSION_MAJOR EQUAL 6))
message(STATUS "x86/ARM + Qt6 环境，启用 pzip 高性能压缩插件")
add_subdirectory(pzip)
add_subdirectory(clipzipplugin)
else()
message(STATUS "非 x86/ARM + Qt6 环境，使用默认 libzip 插件")
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/clipzipplugin/clipzipplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ QString CliPzipPlugin::getPzipPath() const

// 开发环境：尝试从应用程序目录查找
QString appDir = QCoreApplication::applicationDirPath();
QString devPath = appDir + "/../3rdparty/pzip/pzip";
QString devPath = appDir + "/../src/pzip/pzip";
if (QFileInfo::exists(devPath)) {
return devPath;
}
Expand All @@ -91,7 +91,7 @@ QString CliPzipPlugin::getPunzipPath() const

// 开发环境：尝试从应用程序目录查找
QString appDir = QCoreApplication::applicationDirPath();
QString devPath = appDir + "/../3rdparty/pzip/punzip";
QString devPath = appDir + "/../src/pzip/punzip";
if (QFileInfo::exists(devPath)) {
return devPath;
}
Expand Down
5 changes: 5 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,8 @@ install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.service
# Install DBus interface XML file
install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.xml
DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/)

# pzip 高性能并行压缩工具（仅 x86/ARM + Qt6 环境启用）
if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm|x86_64|amd64") AND (QT_VERSION_MAJOR EQUAL 6))
add_subdirectory(pzip)
endif()
0 3rdparty/pzip/CMakeLists.txt → src/pzip/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/cmd/punzip_main.cpp → src/pzip/cmd/punzip_main.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/cmd/pzip_main.cpp → src/pzip/cmd/pzip_main.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/archiver.h → src/pzip/include/pzip/archiver.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/common.h → src/pzip/include/pzip/common.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/extractor.h → src/pzip/include/pzip/extractor.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/fast_deflate.h → src/pzip/include/pzip/fast_deflate.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/file_task.h → src/pzip/include/pzip/file_task.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/pzip.h → src/pzip/include/pzip/pzip.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/utils.h → src/pzip/include/pzip/utils.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/worker_pool.h → src/pzip/include/pzip/worker_pool.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/zip_reader.h → src/pzip/include/pzip/zip_reader.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/include/pzip/zip_writer.h → src/pzip/include/pzip/zip_writer.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/archiver.cpp → src/pzip/src/archiver.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/extractor.cpp → src/pzip/src/extractor.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/fast_deflate.cpp → src/pzip/src/fast_deflate.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/file_task.cpp → src/pzip/src/file_task.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/utils.cpp → src/pzip/src/utils.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/worker_pool.cpp → src/pzip/src/worker_pool.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/zip_reader.cpp → src/pzip/src/zip_reader.cpp
View file
Open in desktop
File renamed without changes.
0 3rdparty/pzip/src/zip_writer.cpp → src/pzip/src/zip_writer.cpp
View file
Open in desktop
File renamed without changes.