From 49f401d03275f4cf148052b5a01888e44933567d Mon Sep 17 00:00:00 2001 From: liuzhilin Date: Fri, 12 Apr 2024 16:34:48 +0800 Subject: [PATCH 1/2] fix-build-error Signed-off-by: pangqing --- 0001-fix-build-error.patch | 41 ++++++++++++++++++++++++++++++++++++++ deepin-system-monitor.spec | 13 +++++------- 2 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 0001-fix-build-error.patch diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch new file mode 100644 index 0000000..f54ad56 --- /dev/null +++ b/0001-fix-build-error.patch @@ -0,0 +1,41 @@ +From bcb66e042058c44dc3b2018ddfb2ce41e6bdc079 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Fri, 12 Apr 2024 16:31:04 +0800 +Subject: [PATCH] fix-build-error + +--- + deepin-system-monitor-main/CMakeLists.txt | 3 +++ + deepin-system-monitor-plugin-popup/CMakeLists.txt | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/deepin-system-monitor-main/CMakeLists.txt b/deepin-system-monitor-main/CMakeLists.txt +index 035dad5..0f95bf2 100644 +--- a/deepin-system-monitor-main/CMakeLists.txt ++++ b/deepin-system-monitor-main/CMakeLists.txt +@@ -68,6 +68,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libsmartcols/src) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) ++include_directories(/usr/include/dtk5/DWidget/) ++include_directories(/usr/include/dtk5/DCore/) ++include_directories(/usr/include/dtk5/DGui/) + + #安全测试加固编译参数 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie") +diff --git a/deepin-system-monitor-plugin-popup/CMakeLists.txt b/deepin-system-monitor-plugin-popup/CMakeLists.txt +index c430c98..0d0f7f8 100644 +--- a/deepin-system-monitor-plugin-popup/CMakeLists.txt ++++ b/deepin-system-monitor-plugin-popup/CMakeLists.txt +@@ -278,6 +278,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC + # ${Qt5Widgets_INCLUDE_DIRS} + # ${DtkWidget_INCLUDE_DIRS} + ${DdeDockInterface_INCLUDE_DIRS} ++ /usr/include/dtk5/DWidget/ ++ /usr/include/dtk5/DCore/ ++ /usr/include/dtk5/DGui/ + ) + target_link_libraries(${PROJECT_NAME} + Qt5::Core +-- +2.39.3 + diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index 149be6b..01fbbb0 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -1,16 +1,9 @@ %global debug_package %{nil} -%define pkgrelease 1 -%if 0%{?openeuler} -%define specrelease %{pkgrelease} -%else -## allow specrelease to have configurable %%{?dist} tag in other distribution -%define specrelease %{pkgrelease}%{?dist} -%endif Name: deepin-system-monitor Version: 5.9.31 -Release: %{specrelease} +Release: 2 Summary: A more user-friendly system monitor License: GPLv3 URL: https://github.com/linuxdeepin/deepin-system-monitor @@ -18,6 +11,7 @@ Source0: %{name}-%{version}.tar.gz Patch0: 0001-procps-ng-update-4.0.0.patch Patch1: 0002-Remove-all-symbol-table-and-relocation-information-f.patch Patch2: 0003-feat-add-build-option-to-disable-wayland-support.patch +Patch3: 0001-fix-build-error.patch BuildRequires: qt5-devel BuildRequires: cmake @@ -122,6 +116,9 @@ fi %changelog +* Fri Apr 12 2024 liuzhilin - 5.9.31-2 +- fix-build-error + * Mon Jul 24 2023 leeffo - 5.9.31-1 - upgrade to version 5.9.31 -- Gitee From 4656e43ef604c35ad55f4dab99111829fd99ce22 Mon Sep 17 00:00:00 2001 From: songmingliang Date: Wed, 25 Sep 2024 11:36:50 +0800 Subject: [PATCH 2/2] delete redundant 0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch Signed-off-by: pangqing --- ...isplay-of-the-system-monitor-when-th.patch | 82 ------------------- deepin-system-monitor.spec | 6 +- 2 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch diff --git a/0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch b/0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch deleted file mode 100644 index f3ce257..0000000 --- a/0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8f76d34ed203bc07d20ba0283c95903de5347888 Mon Sep 17 00:00:00 2001 -From: yangxianzhao -Date: Thu, 6 Apr 2023 14:50:02 +0800 -Subject: [PATCH] Fix incomplete display of the system monitor when the - resolution is 1020*768 - ---- - src/CMakeLists.txt | 1 + - src/constant.h | 27 +++++++++++++++++++++++++++ - src/main.cpp | 3 ++- - 3 files changed, 30 insertions(+), 1 deletion(-) - create mode 100644 src/constant.h - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5df6473..b71fced 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -59,6 +59,7 @@ set(HPP_GLOBAL - compact_disk_monitor.h - smooth_curve_generator.h - settings.h -+ constant.h - ) - - set(CPP_GLOBAL -diff --git a/src/constant.h b/src/constant.h -new file mode 100644 -index 0000000..9a2967d ---- /dev/null -+++ b/src/constant.h -@@ -0,0 +1,27 @@ -+/* -+* Copyright (C) 2011 ~ 2020 Uniontech Software Technology Co.,Ltd -+* -+* Author: Wang Yong -+* Maintainer: maojj -+* -+* This program is free software: you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation, either version 3 of the License, or -+* any later version. -+* This program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* You should have received a copy of the GNU General Public License -+* along with this program. If not, see . -+*/ -+ -+#ifndef CONSTANT_H -+#define CONSTANT_H -+ -+namespace Constant { -+const int WINDOW_MIN_WIDTH = 900; -+const int WINDOW_MIN_HEIGHT = 750; -+}; // namespace Constant -+ -+#endif -diff --git a/src/main.cpp b/src/main.cpp -index 10c7725..bd5b407 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -23,6 +23,7 @@ - #include "settings.h" - #include "gui/main_window.h" - #include "common/perf.h" -+#include "constant.h" - - #include - #include -@@ -85,7 +86,7 @@ int main(int argc, char *argv[]) - &DApplication::newInstanceStarted, - &mw, - &MainWindow::activateWindow); -- -+ mw.setMinimumSize(QSize(Constant::WINDOW_MIN_WIDTH, Constant::WINDOW_MIN_HEIGHT)); - Dtk::Widget::moveToCenter(&mw); - mw.show(); - --- -2.18.4 - diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index 01fbbb0..9dd628d 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -1,9 +1,10 @@ %global debug_package %{nil} +%define __cmake_builddir $(pwd) Name: deepin-system-monitor Version: 5.9.31 -Release: 2 +Release: 3 Summary: A more user-friendly system monitor License: GPLv3 URL: https://github.com/linuxdeepin/deepin-system-monitor @@ -116,6 +117,9 @@ fi %changelog +* Wed Sep 25 2024 songmingliang - 5.9.31-3 +- delete redundant 0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch + * Fri Apr 12 2024 liuzhilin - 5.9.31-2 - fix-build-error -- Gitee