diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index 231a3db2cc1b98a5f2fe5a6a47210038437a97a2..35e80688365f3167f20d2d3d3b374f2be260da15 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -1,11 +1,12 @@ Name: deepin-system-monitor Version: 5.6.11.13 -Release: 2 +Release: 3 Summary: A more user-friendly system monitor License: GPLv3 URL: https://github.com/linuxdeepin/deepin-system-monitor Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: Fix-link-failure-with-gcc-10.patch +Patch1: modify-QPainterPath-error.patch BuildRequires: qt5-devel BuildRequires: cmake @@ -28,6 +29,7 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: deepin-gettext-tools BuildRequires: libicu-devel +BuildRequires: qt5-qtbase-private-devel Recommends: deepin-manual %description @@ -58,6 +60,9 @@ popd %{_datadir}/polkit-1/actions/com.deepin.pkexec.deepin-system-monitor.policy %changelog +* Tue Feb 08 2022 liweigang - 5.6.11.13-3 +- fix build error + * Thu Jul 29 2021 weidong - 5.6.11.13-2 - Fix gcc10.3 compilation deepin-system-monitor failed diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..49fc13a1f84bc709065d3d21454d029a5f1929b2 --- /dev/null +++ b/modify-QPainterPath-error.patch @@ -0,0 +1,99 @@ +diff --color -Naur a/src/compact_disk_monitor.h b/src/compact_disk_monitor.h +--- a/src/compact_disk_monitor.h 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/compact_disk_monitor.h 2022-02-08 14:29:42.327456389 +0800 +@@ -25,6 +25,7 @@ + #define COMPACTDISKMONITOR_H + + #include ++#include + #include + + DWIDGET_USE_NAMESPACE +diff --color -Naur a/src/compact_memory_monitor.cpp b/src/compact_memory_monitor.cpp +--- a/src/compact_memory_monitor.cpp 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/compact_memory_monitor.cpp 2022-02-08 14:50:18.537669887 +0800 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "compact_memory_monitor.h" +diff --color -Naur a/src/compact_network_monitor.h b/src/compact_network_monitor.h +--- a/src/compact_network_monitor.h 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/compact_network_monitor.h 2022-02-08 14:31:55.231230634 +0800 +@@ -25,6 +25,7 @@ + #define COMPACTNETWORKMONITOR_H + + #include ++#include + #include + + DWIDGET_USE_NAMESPACE +diff --color -Naur a/src/cpu_monitor.h b/src/cpu_monitor.h +--- a/src/cpu_monitor.h 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/cpu_monitor.h 2022-02-08 14:28:01.351305810 +0800 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + DWIDGET_USE_NAMESPACE + +diff --color -Naur a/src/disk_monitor.h b/src/disk_monitor.h +--- a/src/disk_monitor.h 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/disk_monitor.h 2022-02-08 14:29:23.676121730 +0800 +@@ -25,6 +25,7 @@ + #define DISKMONITOR_H + + #include ++#include + #include + + DWIDGET_USE_NAMESPACE +diff --color -Naur a/src/gui/base_header_view.cpp b/src/gui/base_header_view.cpp +--- a/src/gui/base_header_view.cpp 2022-02-08 14:27:14.761304620 +0800 ++++ b/src/gui/base_header_view.cpp 2022-02-08 14:28:59.121028043 +0800 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + + #include "base_header_view.h" +diff --color -Naur a/src/memory_monitor.cpp b/src/memory_monitor.cpp +--- a/src/memory_monitor.cpp 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/memory_monitor.cpp 2022-02-08 14:30:17.758244618 +0800 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --color -Naur a/src/network_monitor.h b/src/network_monitor.h +--- a/src/network_monitor.h 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/network_monitor.h 2022-02-08 14:28:28.142223165 +0800 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + DWIDGET_USE_NAMESPACE + +diff --color -Naur a/src/utils.cpp b/src/utils.cpp +--- a/src/utils.cpp 2022-02-08 14:27:14.753304976 +0800 ++++ b/src/utils.cpp 2022-02-08 14:33:06.529286181 +0800 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + #include + #include