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 f3ce2572c51aac8788834db600cbe2c33ebe008e..0000000000000000000000000000000000000000 --- 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 01fbbb0d173494d016fb7a73905ed074d3cd6d3b..bf5d2be86bb411bc0ae1d74801681cac06955eae 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -3,7 +3,7 @@ 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 +116,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