Skip to content

Commit e830d8d

Browse files
committed
feat: issues of buildpackage on Qt5.
Adapted to the v20 system, issues of buildpackage on Qt5. 适配v20系统,完成Qt5环境的打包流程。 v20 BUG 分支合一到v25主线 Task: https://pms.uniontech.com/task-view-383475.html
1 parent 8e92808 commit e830d8d

File tree

5 files changed

+89
-55
lines changed

5 files changed

+89
-55
lines changed

debian/control

Lines changed: 11 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,14 @@ Build-Depends:
66
debhelper (>= 11),
77
cmake,
88
pkg-config,
9-
# Qt5
10-
qtbase5-dev,
11-
qtbase5-private-dev,
12-
qttools5-dev,
13-
qttools5-dev-tools,
14-
qtmultimedia5-dev,
15-
libqt5svg5-dev,
16-
libqt5x11extras5-dev,
179
# Qt6
18-
qt6-base-dev,
19-
qt6-base-private-dev,
20-
qt6-tools-dev,
21-
qt6-tools-dev-tools,
22-
qt6-multimedia-dev,
23-
libqt6svg6-dev,
24-
libqt6opengl6-dev,
10+
qt6-base-dev | qtbase5-dev,
11+
qt6-base-private-dev | qtbase5-private-dev,
12+
qt6-tools-dev | qttools5-dev,
13+
qt6-tools-dev-tools | qttools5-dev-tools,
14+
qt6-multimedia-dev | qtmultimedia5-dev,
15+
libqt6svg6-dev | libqt5svg5-dev,
16+
libqt6opengl6-dev | libqt5x11extras5-dev,
2517
libexif-dev,
2618
libsqlite3-dev,
2719
libxcb-util0-dev,
@@ -35,19 +27,12 @@ Build-Depends:
3527
libfreetype6-dev,
3628
libxrender-dev,
3729
# DTK
38-
libdtkwidget-dev,
39-
libdtkcore5-bin,
40-
libdtk6widget-dev,
41-
libdtk6core-bin,
30+
libdtk6widget-dev | libdtkwidget-dev,
31+
libdtk6core-bin | libdtkcore5-bin,
32+
libdfm6-io-dev | libdfm-io-dev,
4233
libmediainfo-dev,
4334
libffmpegthumbnailer-dev,
44-
libtiff-dev,
45-
# Enable use dfm io to copy MTP mount file, Use `|`(or) relationship to
46-
# compatible different environments, hello will not be used.
47-
# WARNING: control file changes may cause hello to be installed
48-
# instead of libdfm-io-dev.
49-
libdfm6-io-dev | hello,
50-
libdfm-io-dev | hello
35+
libtiff-dev
5136
Standards-Version: 3.9.8
5237
Homepage: http://www.deepin.org
5338

@@ -73,26 +58,3 @@ Replaces:
7358
Recommends: libqt6libgtk2, kimageformat6-plugins, deepin-ocr
7459
Description: Image Viewer library development headers.
7560
Deepin Image Viewer library development headers.
76-
77-
# Support Qt5
78-
Package: libimageeditor
79-
Architecture: any
80-
Depends: ${shlibs:Depends}, ${misc:Depends}
81-
Conflicts:
82-
libimage-viewer
83-
Replaces:
84-
libimage-viewer
85-
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr, ffmpegthumbnailer, ffmpeg
86-
Description: Image Viewer library.
87-
Deepin Image Viewer library.
88-
89-
Package: libimageeditor-dev
90-
Architecture: any
91-
Depends: ${shlibs:Depends}, ${misc:Depends}, libimageeditor(=${binary:Version})
92-
Conflicts:
93-
libimage-viewer-dev
94-
Replaces:
95-
libimage-viewer-dev
96-
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr
97-
Description: Image Viewer library development headers.
98-
Deepin Image Viewer library development headers.

debian/control.in

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
Source: image-editor
2+
Section: utils
3+
Priority: optional
4+
Maintainer: Deepin Packages Builder <packages@deepin.com>
5+
Build-Depends:
6+
debhelper (>= 11),
7+
cmake,
8+
pkg-config,
9+
# Qt5
10+
qtbase5-dev,
11+
qtbase5-private-dev,
12+
qttools5-dev,
13+
qttools5-dev-tools,
14+
qtmultimedia5-dev,
15+
libqt5svg5-dev,
16+
libqt5x11extras5-dev,
17+
libexif-dev,
18+
libsqlite3-dev,
19+
libxcb-util0-dev,
20+
libstartup-notification0-dev,
21+
libraw-dev,
22+
x11proto-xext-dev,
23+
libmtdev-dev,
24+
libegl1-mesa-dev,
25+
libudev-dev,
26+
libfontconfig1-dev,
27+
libfreetype6-dev,
28+
libxrender-dev,
29+
# DTK
30+
libdtkwidget-dev,
31+
libdtkcore5-bin,
32+
libmediainfo-dev,
33+
libffmpegthumbnailer-dev,
34+
libtiff-dev,
35+
libdfm-io-dev
36+
Standards-Version: 3.9.8
37+
Homepage: http://www.deepin.org
38+
39+
Package: libimageeditor
40+
Architecture: any
41+
Depends: ${shlibs:Depends}, ${misc:Depends}
42+
Conflicts:
43+
libimage-viewer
44+
Replaces:
45+
libimage-viewer
46+
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr, ffmpegthumbnailer, ffmpeg
47+
Description: Image Viewer library.
48+
Deepin Image Viewer library.
49+
50+
Package: libimageeditor-dev
51+
Architecture: any
52+
Depends: ${shlibs:Depends}, ${misc:Depends}, libimageeditor(=${binary:Version})
53+
Conflicts:
54+
libimage-viewer-dev
55+
Replaces:
56+
libimage-viewer-dev
57+
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr
58+
Description: Image Viewer library development headers.
59+
Deepin Image Viewer library development headers.

debian/rules

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@ include /usr/share/dpkg/default.mk
33
export QT_SELECT=6
44
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
55

6+
# 检测当前安装的Qt版本
7+
define detect_qt_version
8+
ifneq (,$(shell which qmake6 2>/dev/null))
9+
$(info ---------- Using Qt6...)
10+
QT_VERSION := 6
11+
else
12+
$(info ---------- Using Qt5...)
13+
QT_VERSION := 5
14+
$(shell cp debian/control.in debian/control)
15+
endif
16+
endef
17+
18+
# 调用检测Qt版本的命令
19+
$(eval $(call detect_qt_version))
20+
621
%:
722
dh $@
823

libimageviewer/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(SUPPORT_QT6)
22
include(libimageviewer-qt6.cmake)
3+
else()
4+
include(libimageviewer-qt5.cmake)
35
endif()
4-
5-
include(libimageviewer-qt5.cmake)
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
if(SUPPORT_QT6)
22
include(libimagevisualresult-qt6.cmake)
3+
else()
4+
include(libimagevisualresult-qt5.cmake)
35
endif()
4-
5-
6-
include(libimagevisualresult-qt5.cmake)
7-

0 commit comments

Comments
 (0)