Skip to content

chore: Adjusted build and packaging strategy #22

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
Nov 26, 2025
Merged

chore: Adjusted build and packaging strategy #22

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
18 changes: 5 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,11 @@ include(CMakePackageConfigHelpers)
set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/deepin-pdfium)
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})

# 创建Qt5版本库
if(Qt5_FOUND)
message(STATUS ">>> Enable Qt5 version of the library")
set(QT_DESIRED_VERSION 5)
set(TARGET_NAME ${PROJECT_NAME}5)
include(target.cmake)
endif()

# 创建Qt6版本库
if(Qt6_FOUND)
message(STATUS ">>> Enable Qt6 version of the library")
# keep the same project name for Qt6 in order to compability with other applications, ie. DFM
set(QT_DESIRED_VERSION 6)
set(TARGET_NAME ${PROJECT_NAME})
include(target.cmake)
else()
set(QT_DESIRED_VERSION 5)
endif()

set(TARGET_NAME ${PROJECT_NAME})
include(target.cmake)
22 changes: 4 additions & 18 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ Priority: optional
Maintainer: deepin <packages@deepin.com>
Build-Depends: debhelper (>= 11),
cmake,
qt6-base-dev,
qt6-tools-dev-tools,
qtbase5-dev,
qttools5-dev-tools,
qt6-base-dev | qtbase5-dev,
qt6-tools-dev-tools | qttools5-dev-tools,
pkg-config,
libjpeg-dev,
libicu-dev,
Expand All @@ -23,23 +21,11 @@ Standards-Version: 4.3.0
Package: libdeepin-pdfium
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A libaray about PDF base on Qt6.
A library for parsing and editing and displaying PDF.

Package: libdeepin-pdfium5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A libaray about PDF base on Qt5.
Description: A libaray about PDF.
A library for parsing and editing and displaying PDF.

Package: libdeepin-pdfium-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libdeepin-pdfium
Description: A libaray about PDF dev base on Qt6.
Description: A libaray about PDF dev.
A libaray that provides for parsing and editing and displaying PDF interface dev.

Package: libdeepin-pdfium5-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libdeepin-pdfium5
Description: A libaray about PDF dev base on Qt5.
A libaray that provides for parsing and editing and displaying PDF interface dev.
3 changes: 0 additions & 3 deletions debian/libdeepin-pdfium5-dev.install
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion debian/libdeepin-pdfium5.install
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions include/dpdfglobal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
#include <QDebug>
#include <QElapsedTimer>
#include <QRectF>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <QRecursiveMutex>
#endif

#ifndef BUILD_DEEPDF_STATIC
# if defined(BUILD_DEEPDF_LIB)
Expand Down