Skip to content

Commit 98dae86

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 98dae86

3 files changed

Lines changed: 75 additions & 27 deletions

File tree

debian/control

Lines changed: 13 additions & 27 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,
17-
# 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,
9+
# Qt
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,13 @@ 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 | hello,
33+
libdfm-io-dev | hello,
4234
libmediainfo-dev,
4335
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
36+
libtiff-dev
5137
Standards-Version: 3.9.8
5238
Homepage: http://www.deepin.org
5339

debian/control.in

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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+
# Qt
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,
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+
libdtk6widget-dev | libdtkwidget-dev,
31+
libdtk6core-bin | libdtkcore5-bin,
32+
libdfm6-io-dev | hello,
33+
libdfm-io-dev | hello,
34+
libmediainfo-dev,
35+
libffmpegthumbnailer-dev,
36+
libtiff-dev
37+
Standards-Version: 3.9.8
38+
Homepage: http://www.deepin.org
39+
40+
Package: libimageeditor
41+
Architecture: any
42+
Depends: ${shlibs:Depends}, ${misc:Depends}
43+
Conflicts:
44+
libimage-viewer
45+
Replaces:
46+
libimage-viewer
47+
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr, ffmpegthumbnailer, ffmpeg
48+
Description: Image Viewer library.
49+
Deepin Image Viewer library.
50+
51+
Package: libimageeditor-dev
52+
Architecture: any
53+
Depends: ${shlibs:Depends}, ${misc:Depends}, libimageeditor(=${binary:Version})
54+
Conflicts:
55+
libimage-viewer-dev
56+
Replaces:
57+
libimage-viewer-dev
58+
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr
59+
Description: Image Viewer library development headers.
60+
Deepin Image Viewer library development headers.

debian/rules

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

6+
$(shell echo "Checking OS version..." >&2; test -f /etc/os-version && grep -q "MajorVersion=20" /etc/os-version && cp debian/control.in debian/control)
7+
68
%:
79
dh $@
810

0 commit comments

Comments
 (0)