Skip to content

chore: Fix CI and remove unused dependency package #149

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
Mar 27, 2025
Merged

chore: Fix CI and remove unused dependency package #149

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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@ ui_*.h

#linglong building dir
linglong
build
build

# vscode
.vscode
1 change: 0 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Build-Depends:
libdtk6widget-dev [amd64 arm64 i386 loong64] | libdtkwidget-dev,
libdtk6gui-dev [amd64 arm64 i386 loong64] | libdtkgui-dev,
libdtk6core-dev [amd64 arm64 i386 loong64] | libdtkcore-dev,
libspectre-dev,
libdjvulibre-dev,
libtiff-dev,
libjpeg-dev,
Expand Down
3 changes: 3 additions & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
include /usr/share/dpkg/default.mk

# 有的Qt5环境需要设置环境变量，Qt6不需要
export QT_SELECT=5

# 检测当前安装的Qt版本，优先使用Qt6，否则使用Qt5
define detect_qt_version
ifneq (,$(shell which qmake6 2>/dev/null))
Expand Down
2 changes: 1 addition & 1 deletion deepin_reader.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ versionAtLeast(QT_VERSION, 6.0.0) {
QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml

# Qt5 specific configurations
PKGCONFIG += dtkwidget dframeworkdbus poppler-qt5
PKGCONFIG += dtkwidget dframeworkdbus

QMAKE_LRELEASE = lrelease

Expand Down
2 changes: 1 addition & 1 deletion reader/reader.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ equals(QT_MAJOR_VERSION, 6) {
QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml

# Qt5 specific configurations
PKGCONFIG += dtkwidget dframeworkdbus poppler-qt5
PKGCONFIG += dtkwidget dframeworkdbus

QMAKE_LRELEASE = lrelease
}
Expand Down
2 changes: 1 addition & 1 deletion reader/src.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ equals(QT_MAJOR_VERSION, 6) {
QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml

# Qt5 specific configurations
PKGCONFIG += dtkwidget dframeworkdbus poppler-qt5
PKGCONFIG += dtkwidget dframeworkdbus

QMAKE_LRELEASE = lrelease
}
Expand Down