fix: add Qt5 build compatibility

- Update debian/control to support both Qt5 and Qt6 dependencies
- Add Qt version auto-detection in debian/rules
- Fix DConfig installation check using dtk_add_config_meta_files command
- Add missing includes for DApplicationHelper, DGuiApplicationHelper, QtMath
- Fix QString::split API for Qt5 (use QString::SkipEmptyParts)
- Fix QSet construction for Qt < 5.14
- Add mount_attr struct definition for older kernels

Log: Add build compatibility for Qt5 environment while maintaining Qt6 support

Author: itsXuSt

CMakeLists.txt

@@ -87,19 +87,24 @@ set(system_monitor_plugin assets/configs/org.deepin.system-monitor.plugin.json)
 set(system_monitor_plugin_popup assets/configs/org.deepin.system-monitor.plugin.popup.json)
 set(system_monitor_plugin_server assets/configs/org.deepin.system-monitor.server.json)
 
-if (DEFINED DSG_DATA_DIR)
+# DTK6 提供 dtk_add_config_meta_files 命令，DTK5 需要手动安装
+# 需要显式引入 DConfig 模块以确保 DSG_DATA_DIR 在当前作用域可用
+if (DTK_VERSION_MAJOR EQUAL 6)
+    find_package(Dtk6DConfig QUIET)
+endif()
+
+if (COMMAND dtk_add_config_meta_files)
     dtk_add_config_meta_files(APPID ${APPID} FILES ${system_monitor_main})
     dtk_add_config_meta_files(APPID ${APPID} FILES ${system_monitor_daemon})
     dtk_add_config_meta_files(APPID ${APPID} FILES ${system_monitor_plugin})
     dtk_add_config_meta_files(APPID ${APPID} FILES ${system_monitor_plugin_popup})
     dtk_add_config_meta_files(APPID ${APPID} FILES ${system_monitor_plugin_server})
-    message("-- DConfig is supported by DTK")
+    message("-- DConfig is supported by DTK (using dtk_add_config_meta_files)")
 else()
     install(FILES ${system_monitor_main} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dsg/configs/${APPID}/)
     install(FILES ${system_monitor_daemon} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dsg/configs/${APPID}/)
     install(FILES ${system_monitor_plugin} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dsg/configs/${APPID}/)
     install(FILES ${system_monitor_plugin_popup} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dsg/configs/${APPID}/)
     install(FILES ${system_monitor_plugin_server} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dsg/configs/${APPID}/)
-
-    message("-- DConfig is not supported by DTK")
+    message("-- DConfig fallback: installing config files directly")
 endif()

debian/control

@@ -2,20 +2,20 @@ Source: deepin-system-monitor
 Section: utils
 Priority: optional
 Maintainer: Deepin Packages Builder <packages@deepin.com>
-Build-Depends: 
+Build-Depends:
  debhelper-compat (= 11),
  cmake,
  pkg-config,
- qt6-base-dev,
- qt6-svg-dev,
- qt6-tools-dev,
- libdtk6core-dev,
- libdtk6gui-dev,
- libdtk6widget-dev,
+ qt6-base-dev | qtbase5-dev,
+ qt6-svg-dev | libqt5svg5-dev,
+ qt6-tools-dev | qttools5-dev,
+ qt6-tools-dev-tools | qttools5-dev-tools,
+ libdtk6core-dev | libdtkcore-dev,
+ libdtk6gui-dev | libdtkgui-dev,
+ libdtk6widget-dev | libdtkwidget-dev,
  libxcb1-dev,
  libxext-dev,
  libpcap-dev,
- qt6-tools-dev-tools,
  libicu-dev,
  deepin-gettext-tools,
  libxcb-util0-dev,

debian/rules

@@ -5,6 +5,9 @@ include /usr/share/dpkg/default.mk
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DH_AUTO_ARGS = --parallel --buildsystem=cmake
 
+# 自动检测 Qt 版本：优先使用 Qt6，如果没有则使用 Qt5
+QT_VERSION_MAJOR := $(shell pkg-config --exists Qt6Core && echo 6 || echo 5)
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -15,4 +18,5 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_SAFETYTEST_ARG="CMAKE_SAFETYTEST_ARG_OFF" \
+	-DQT_VERSION_MAJOR=$(QT_VERSION_MAJOR) \
 	-DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)

deepin-system-monitor-main/CMakeLists.txt

@@ -623,9 +623,11 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets/deepin-system-monitor DESTINA
 
 #hw机型增加DConfig配置
 set(APPID org.deepin.system-monitor)
-message("-- DConfig is supported by DTK ${PROJECT_SOURCE_DIR}")
 set(configFile ${PROJECT_SOURCE_DIR}/assets/org.deepin.system-monitor.main.json)
-if (DEFINED DSG_DATA_DIR)
-    message("-- DConfig is supported by DTK")
+if (COMMAND dtk_add_config_meta_files)
+    message("-- DConfig is supported by DTK (main app)")
     dtk_add_config_meta_files(APPID ${APPID} FILES ${configFile})
+else()
+    message("-- DConfig fallback: installing config file directly (main app)")
+    install(FILES ${configFile} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dsg/configs/${APPID}/)
 endif()

deepin-system-monitor-main/gui/base/base_detail_view_widget.cpp

@@ -172,7 +172,11 @@ void BaseDetailViewWidget::updateWidgetGrometry()
     m_switchButton->setGeometry(m_detailButton->x() - 30, 10 + titleFont.height() / 2 - m_switchButton->height() / 2, m_switchButton->width(), m_switchButton->height());
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+void BaseDetailViewWidget::onThemeTypeChanged(DApplicationHelper::ColorType themeType)
+#else
 void BaseDetailViewWidget::onThemeTypeChanged(DGuiApplicationHelper::ColorType themeType)
+#endif
 {
     qCDebug(app) << "onThemeTypeChanged, themeType:" << themeType;
     if (themeType == DGuiApplicationHelper::DarkType) {

deepin-system-monitor-main/gui/base/base_detail_view_widget.h

@@ -12,8 +12,16 @@
 #include <QVBoxLayout>
 #include <QPushButton>
 
-class BaseCommandLinkButton;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <DApplicationHelper>
+DWIDGET_USE_NAMESPACE
+#else
+#include <DGuiApplicationHelper>
 DWIDGET_USE_NAMESPACE
+DGUI_USE_NAMESPACE
+#endif
+
+class BaseCommandLinkButton;
 class BaseDetailViewWidget : public QWidget
 {
     Q_OBJECT
@@ -48,7 +56,11 @@ public slots:
     //!
     //! \brief onThemeTypeChanged 主题背景切换
     //!
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    void onThemeTypeChanged(DApplicationHelper::ColorType themeType);
+#else
     void onThemeTypeChanged(DGuiApplicationHelper::ColorType themeType);
+#endif
 
 protected:
     void resizeEvent(QResizeEvent *event);

deepin-system-monitor-main/service/service_manager_worker.cpp

@@ -294,7 +294,7 @@ QString ServiceManagerWorker::readUnitDescriptionFromUnitFile(const QString &pat
         while ((fgets(buf.data(), BLEN, fp))) {
             descStr = QString("Description=%1").arg(buf.data());
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-            QStringList descStrList = descStr.split(QRegularExpression("[\n]"), Qt::SkipEmptyParts);
+            QStringList descStrList = descStr.split(QRegularExpression("[\n]"), QString::SkipEmptyParts);
 #else
             QStringList descStrList = descStr.split(QRegularExpression("[\n]"), Qt::SkipEmptyParts);
 #endif

deepin-system-monitor-plugin/gui/commoniconbutton.cpp

@@ -6,6 +6,7 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTimer>
+#include <QtMath>
 
 #include <DGuiApplicationHelper>
 

deepin-system-monitor-system-server/misc/org.deepin.deepin-system-monitor-system-server.policy

@@ -18,6 +18,8 @@
 		<message xml:lang="ar">المصادقة مطلوبة لتعيين نوع بدء تشغيل الخدمة</message>
 		<description xml:lang="az">Xidmətin başladılma növünü təyin edin</description>
 		<message xml:lang="az">Xidmətin başladılma növünü təyin etmək üçün doğrulama tələb olunur</message>
+		<description xml:lang="bn">সেবা শুরুর ধরন নির্ধারণ করুন</description>
+		<message xml:lang="bn">সেবা শুরুর ধরন নির্ধারণে পরিচালনা করতে জারিফিকেশন প্রয়োজন</message>
 		<description xml:lang="bo">ཞབས་ཞུའི་འགོ་སློང་བྱེད་ཐབས་སྒྲིག་འགོད་བྱེད་པ།</description>
 		<message xml:lang="bo">ཞབས་ཞུའི་འགོ་སློང་ཐབས་སྒྲིག་འགོད་བྱེད་པར་དཔང་དཔྱད་བྱ་དགོས།</message>
 		<description xml:lang="br">Termeniñ doare loc'hañ ar servij</description>
@@ -32,12 +34,16 @@
 		<message xml:lang="de">Authentifizierung ist erforderlich, um den Starttyp des Dienstes einzustellen</message>
 		<description xml:lang="es">Establecer tipo de inicio del servicio</description>
 		<message xml:lang="es">Se requiere autenticación para establecer el tipo de servicio de inicio</message>
+		<description xml:lang="et">Määrake süsteemi käivitusrakendus</description>
+		<message xml:lang="et">Süsteemi käivitusrakenduse määramiseks on vajalik autentimine</message>
 		<description xml:lang="fi">Palvelun käynnistystyypin vaihto</description>
 		<message xml:lang="fi">Palvelun käynnistystyypin vaihtamiseen vaaditaan todennus</message>
 		<description xml:lang="fr">Définir le type de démarrage du service</description>
 		<message xml:lang="fr">L'authentification est requise pour définir le type de démarrage du service</message>
 		<description xml:lang="gl_ES">Estableza o tipo de inicio de servizo</description>
 		<message xml:lang="gl_ES">A autenticación é necesaria para configurar o tipo de inicio de servizo</message>
+		<description xml:lang="he">הגדרת סוג הפעלת שירות</description>
+		<message xml:lang="he">נדרש אימות כדי להגדיר את סוג הפעלת השירות</message>
 		<description xml:lang="hu">Állítsa be a szolgáltatás indítási típusát</description>
 		<message xml:lang="hu">Hitelesítés szükséges a szolgáltatás indítási típusának beállításához</message>
 		<description xml:lang="id">Setel tipe layanan startup</description>
@@ -46,6 +52,10 @@
 		<message xml:lang="it">Autenticazione richiesta per variare il tipo di avvio automatico</message>
 		<description xml:lang="ko">서비스 시작 유형 설정</description>
 		<message xml:lang="ko">서비스 시작 유형을 설정하려면 인증이 필요합니다.</message>
+		<description xml:lang="lo">ຕັ້ງປະເພດການເລີ່ມຕົ້ນຂອງບໍລິການ</description>
+		<message xml:lang="lo">ການຢືນຢັນຕ້ອງການເພື່ອຕັ້ງປະເພດການເລີ່ມຕົ້ນຂອງບໍລິການ</message>
+		<description xml:lang="lt">Nustatyti paslaugos paleidimo tipą</description>
+		<message xml:lang="lt">Tėkite autentifikacijos norint nustatyti paslaugos paleidimo tipą</message>
 		<description xml:lang="ms">Tetapkan jenis permulaan perkhidmatan</description>
 		<message xml:lang="ms">Pengesahihan diperlukan untuk menetapkan jenis permulaan perkhidmatan</message>
 		<description xml:lang="nl">Soort opstart instellen</description>
@@ -58,6 +68,8 @@
 		<message xml:lang="pt_BR">A autenticação é necessária para definir o tipo de inicialização do serviço</message>
 		<description xml:lang="ru">Задать тип запуска службы</description>
 		<message xml:lang="ru">Требуется  аутентификация для установки типа запуска службы </message>
+		<description xml:lang="sl">Nastavi vrsto zacetnega vrata storitve</description>
+		<message xml:lang="sl">Zaustavljanje zacetnega vrata storitve je zahtevano prijavljenost</message>
 		<description xml:lang="sq">Caktoni lloj nisjeje shërbimi</description>
 		<message xml:lang="sq">Që të caktohet lloj nisjeje shërbimi, lyspet mirëfilltësim</message>
 		<description xml:lang="sr">Постави режим покретања услуге</description>
@@ -68,12 +80,12 @@
 		<message xml:lang="ug">مۇلازىمەت باشلاش تىپىنى تەڭشەش ئۈچۈن دەلىللەش تەلەپ قىلىنىدۇ</message>
 		<description xml:lang="uk">Встановлення типу запуску служби</description>
 		<message xml:lang="uk">Для встановлення типу запуску служби слід пройти розпізнавання</message>
+		<description xml:lang="vi">Thiết lập loại khởi động dịch vụ</description>
+		<message xml:lang="vi">Bạn cần xác thực để thiết lập loại khởi động dịch vụ</message>
 		<description xml:lang="zh_CN">设置服务的启动方式</description>
 		<message xml:lang="zh_CN">设置服务的启动方式需要认证</message>
 		<description xml:lang="zh_HK">設置服務的啟動方式</description>
 		<message xml:lang="zh_HK">設置服務的啟動方式需要認證</message>
-		<description xml:lang="lo">ຕັ້ງປະເພດການເລີ່ມຕົ້ນຂອງບໍລິການ</description>
-		<message xml:lang="lo">ຕ້ອງການການຢັ້ງຢືນເພື່ອຕັ້ງປະເພດການເລີ່ມຕົ້ນຂອງບໍລິການ</message>
 		<description xml:lang="zh_TW">設定服務的啟動方式</description>
 		<message xml:lang="zh_TW">設定服務的啟動方式需要認證</message>
 	</action>

deepin-system-monitor-system-server/src/dkapture.h

@@ -15,8 +15,20 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/mount.h>
 #include <netinet/in.h>
 
+// mount_attr 结构体在 Linux 5.12+ 内核中定义，旧内核需要手动定义
+#ifndef MOUNT_ATTR_SIZE_VER0
+struct mount_attr {
+    uint64_t attr_set;
+    uint64_t attr_clr;
+    uint64_t propagation;
+    uint64_t userns_fd;
+};
+#define MOUNT_ATTR_SIZE_VER0 32
+#endif
+
 #define TASK_COMM_LEN 16
 struct FileLog;
 
@@ -761,10 +773,6 @@ struct SeekLog : public FileLog
 #define DATA_LEN 512
 #define PATH_MAX 4096
 
-#ifndef __VMLINUX_H__
-#include <sys/mount.h>
-#endif
-
 struct mount_args
 {
     pid_t pid;