From c95ab64ac4b70d987cc7688d3b3264dd2f471e23 Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Wed, 25 Oct 2023 12:40:04 +0900 Subject: [PATCH] chore(CI): build Qt 6 version by default for deepin CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit deepin OBS 构建默认构建 Qt 6 版本。 注意:对于现存版本的打包移植,目前仍然建议使用 Qt 5 版本。 Log: --- debian/control | 29 ++++++++++++++--------------- debian/rules | 3 ++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index 7bfb3e79..0ad3726d 100644 --- a/debian/control +++ b/debian/control @@ -9,19 +9,18 @@ Build-Depends: libglib2.0-dev, # v-- to get systemduserunitdir from its pkg-config data systemd, - qtbase5-dev, - libqt5svg5-dev, - qtdeclarative5-dev, - qttools5-dev, - qttools5-dev-tools, - qtquickcontrols2-5-dev, + qt6-base-dev, + qt6-svg-dev, + qt6-declarative-dev, + qt6-tools-dev, + qt6-tools-dev-tools, libdtkcommon-dev, - libdtkcore-dev, + libdtk6core-dev, # v-- provides qdbusxml2cpp-fix binary - libdtkcore5-bin, + libdtk6core-bin, # v-- provides DHiDPIHelper - libdtkgui-dev, - libdtkdeclarative-dev, + libdtk6gui-dev, + libdtk6declarative-dev, libappstreamqt-dev Standards-Version: 4.6.0 Rules-Requires-Root: no @@ -31,12 +30,12 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - qml-module-qtquick-layouts, - qml-module-qtquick-window2, - qml-module-qtquick-controls2, - qml-module-qtquick-controls2-styles-chameleon, + qml6-module-qtquick-layouts, + qml6-module-qtquick-window, + qml6-module-qtquick-controls, + qml6-module-qtquick-controls2-styles-chameleon, # v-- actually should be depended by qqc2-styles-chameleon - qml-module-qtgraphicaleffects + qml6-module-qt5compat-graphicaleffects Conflicts: dde-launcher Replaces: dde-launcher Description: diff --git a/debian/rules b/debian/rules index aad46f1c..16f88f11 100755 --- a/debian/rules +++ b/debian/rules @@ -16,4 +16,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_configure: dh_auto_configure -- \ - -DVERSION=$(DEB_VERSION_UPSTREAM) + -DVERSION=$(DEB_VERSION_UPSTREAM) \ + -DPREFER_QT_5=OFF