Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 11 additions & 49 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,14 @@ Build-Depends:
debhelper (>= 11),
cmake,
pkg-config,
# Qt5
qtbase5-dev,
qtbase5-private-dev,
qttools5-dev,
qttools5-dev-tools,
qtmultimedia5-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
# Qt6
qt6-base-dev,
qt6-base-private-dev,
qt6-tools-dev,
qt6-tools-dev-tools,
qt6-multimedia-dev,
libqt6svg6-dev,
libqt6opengl6-dev,
qt6-base-dev | qtbase5-dev,
qt6-base-private-dev | qtbase5-private-dev,
qt6-tools-dev | qttools5-dev,
qt6-tools-dev-tools | qttools5-dev-tools,
qt6-multimedia-dev | qtmultimedia5-dev,
libqt6svg6-dev | libqt5svg5-dev,
libqt6opengl6-dev | libqt5x11extras5-dev,
libexif-dev,
libsqlite3-dev,
libxcb-util0-dev,
Expand All @@ -35,19 +27,12 @@ Build-Depends:
libfreetype6-dev,
libxrender-dev,
# DTK
libdtkwidget-dev,
libdtkcore5-bin,
libdtk6widget-dev,
libdtk6core-bin,
libdtk6widget-dev | libdtkwidget-dev,
libdtk6core-bin | libdtkcore5-bin,
libdfm6-io-dev | libdfm-io-dev,
libmediainfo-dev,
libffmpegthumbnailer-dev,
libtiff-dev,
# Enable use dfm io to copy MTP mount file, Use `|`(or) relationship to
# compatible different environments, hello will not be used.
# WARNING: control file changes may cause hello to be installed
# instead of libdfm-io-dev.
libdfm6-io-dev | hello,
libdfm-io-dev | hello
libtiff-dev
Standards-Version: 3.9.8
Homepage: http://www.deepin.org

Expand All @@ -73,26 +58,3 @@ Replaces:
Recommends: libqt6libgtk2, kimageformat6-plugins, deepin-ocr
Description: Image Viewer library development headers.
Deepin Image Viewer library development headers.

# Support Qt5
Package: libimageeditor
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts:
libimage-viewer
Replaces:
libimage-viewer
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr, ffmpegthumbnailer, ffmpeg
Description: Image Viewer library.
Deepin Image Viewer library.

Package: libimageeditor-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libimageeditor(=${binary:Version})
Conflicts:
libimage-viewer-dev
Replaces:
libimage-viewer-dev
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr
Description: Image Viewer library development headers.
Deepin Image Viewer library development headers.
59 changes: 59 additions & 0 deletions debian/control.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
Source: image-editor
Section: utils
Priority: optional
Maintainer: Deepin Packages Builder <packages@deepin.com>
Build-Depends:
debhelper (>= 11),
cmake,
pkg-config,
# Qt5
qtbase5-dev,
qtbase5-private-dev,
qttools5-dev,
qttools5-dev-tools,
qtmultimedia5-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libexif-dev,
libsqlite3-dev,
libxcb-util0-dev,
libstartup-notification0-dev,
libraw-dev,
x11proto-xext-dev,
libmtdev-dev,
libegl1-mesa-dev,
libudev-dev,
libfontconfig1-dev,
libfreetype6-dev,
libxrender-dev,
# DTK
libdtkwidget-dev,
libdtkcore5-bin,
libmediainfo-dev,
libffmpegthumbnailer-dev,
libtiff-dev,
libdfm-io-dev
Standards-Version: 3.9.8
Homepage: http://www.deepin.org

Package: libimageeditor
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts:
libimage-viewer
Replaces:
libimage-viewer
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr, ffmpegthumbnailer, ffmpeg
Description: Image Viewer library.
Deepin Image Viewer library.

Package: libimageeditor-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libimageeditor(=${binary:Version})
Conflicts:
libimage-viewer-dev
Replaces:
libimage-viewer-dev
Recommends: libqt5libqgtk2, kimageformat-plugins, deepin-ocr
Description: Image Viewer library development headers.
Deepin Image Viewer library development headers.
14 changes: 14 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@ include /usr/share/dpkg/default.mk
export QT_SELECT=6
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

# 定义检测Qt版本的函数
define check_qt_version
$(shell echo "Checking OS version..." >&2; \
if ! which qmake6 >/dev/null 2>&1; then \
cp debian/control.in debian/control; \
echo "Using Qt5..." >&2; \
else \
echo "Using Qt6..." >&2; \
fi)
endef

# 调用检测Qt版本的命令
$(eval $(call check_qt_version))

%:
dh $@

Expand Down
4 changes: 2 additions & 2 deletions libimageviewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if(SUPPORT_QT6)
include(libimageviewer-qt6.cmake)
else()
include(libimageviewer-qt5.cmake)
endif()

include(libimageviewer-qt5.cmake)
6 changes: 2 additions & 4 deletions libimagevisualresult/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
if(SUPPORT_QT6)
include(libimagevisualresult-qt6.cmake)
else()
include(libimagevisualresult-qt5.cmake)
endif()


include(libimagevisualresult-qt5.cmake)

Loading