packages/deepin-system-monitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 [sync] PR-8: [update] update version to 5.8.11

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-07-29 06:37:48 +00:00 committed by Gitee
commit 1243a599bf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 57 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Fix-link-failure-with-gcc-10.patch
View File

@ -1,53 +0,0 @@
From cf73455412549e14f1ff8a01925964f1e7896eaf Mon Sep 17 00:00:00 2001
From: weidong <weidong@uniontech.com>
Date: Tue, 3 Aug 2021 19:12:51 +0800
Subject: [PATCH] Fix link failure with gcc-10
---
src/process/desktop_entry_stat.cpp | 2 +-
src/process/process_stat.cpp | 2 +-
src/process/system_stat.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/process/desktop_entry_stat.cpp b/src/process/desktop_entry_stat.cpp
index d2bedc6..e0a8c9c 100644
--- a/src/process/desktop_entry_stat.cpp
+++ b/src/process/desktop_entry_stat.cpp
@@ -35,7 +35,7 @@ DCORE_USE_NAMESPACE
static const int kUpdateInterval = 1000 * 300; // 5 minutes interval
-auto print_err = [](decltype(errno) e, const QString &msg)
+static void print_err(decltype(errno) e, const QString &msg)
{
qDebug() << QString("Error: [%1] %2, ").arg(e).arg(strerror(e)) << msg;
};
diff --git a/src/process/process_stat.cpp b/src/process/process_stat.cpp
index e68052e..cb161b0 100644
--- a/src/process/process_stat.cpp
+++ b/src/process/process_stat.cpp
@@ -42,7 +42,7 @@
#define PROC_FD_NAME_PATH "/proc/%u/fd/%s"
#define PROC_SCHEDSTAT_PATH "/proc/%u/schedstat"
-auto print_err = [](decltype(errno) e, const QString &msg)
+static void print_err(decltype(errno) e, const QString &msg)
{
qDebug() << QString("Error: [%1] %2, ").arg(e).arg(strerror(e)) << msg;
};
diff --git a/src/process/system_stat.cpp b/src/process/system_stat.cpp
index cc7b359..78060f3 100644
--- a/src/process/system_stat.cpp
+++ b/src/process/system_stat.cpp
@@ -49,7 +49,7 @@
#define MAX_NAME_LEN 128
-auto print_err = [](decltype(errno) e, const QString &msg)
+static void print_err(decltype(errno) e, const QString &msg)
{
qDebug() << QString("Error: [%1] %2, ").arg(e).arg(strerror(e)) << msg;
};
--
2.20.1

BIN
deepin-system-monitor-5.6.11.13.tar.gz
View File

Binary file not shown.

BIN
deepin-system-monitor-5.8.11.tar.gz Normal file
View File

Binary file not shown.

64
deepin-system-monitor.spec
View File

@ -1,12 +1,20 @@
%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.6.11.13
Release: 3
Version: 5.8.11
Release: %{specrelease}
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
@ -14,7 +22,7 @@ BuildRequires: cmake
BuildRequires: dtkwidget-devel
BuildRequires: dtkcore-devel
BuildRequires: pkgconfig(dtkgui)
BuildRequires: pkgconfig(dtkwm) >= 2.0
# BuildRequires: pkgconfig(dtkwm)
BuildRequires: pkgconfig(libprocps)
BuildRequires: pkgconfig(xcb)
@ -22,21 +30,39 @@ BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xtst)
BuildRequires: xcb-util-wm-devel
# BuildRequires: pkgconfig(Qt5DBus)
# BuildRequires: pkgconfig(Qt5Gui)
# BuildRequires: pkgconfig(Qt5Network)
# BuildRequires: pkgconfig(Qt5Widgets)
# BuildRequires: pkgconfig(Qt5X11Extras)
# BuildRequires: qt5-linguist
BuildRequires: libpcap-devel
BuildRequires: libcap-devel
BuildRequires: ncurses-devel
# BuildRequires: ncurses-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: deepin-gettext-tools
BuildRequires: libicu-devel
BuildRequires: qt5-qtbase-private-devel
# BuildRequires: dtkwm-devel
# BuildRequires: qt5-qtmultimedia-devel
# BuildRequires: dtkcore-devel >= 5.1
BuildRequires: libicu-devel
BuildRequires: libnl3-devel
BuildRequires: systemd-devel
# BuildRequires: pkgconfig(libnl-route-3)
#Requires: hicolor-icon-theme
Recommends: deepin-manual
%description
%{summary}.
%prep
%autosetup -p1
%autosetup
# %setup -q
####sed -i 's|lrelease|lrelease-qt5|' translations/translate_generation.sh
# %patch0 -p1
%build
export PATH=%{_qt5_bindir}:$PATH
@ -49,6 +75,23 @@ popd
%install
%make_install -C build INSTALL_ROOT="%buildroot"
# %check
# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
#appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
%post
if command -v setcap > /dev/null; then
if setcap cap_net_raw,cap_dac_read_search,cap_sys_ptrace+ep /usr/bin/deepin-system-monitor;then
chmod u-s /usr/bin/deepin-system-monitor
else
echo "Setcap failed, falling back to setuid"
chmod u+s /usr/bin/deepin-system-monitor
fi
else
echo "Setcap is not installed, falling back to setuid"
chmod u+s /usr/bin/deepin-system-monitor
fi
%files
%doc README.md
%license LICENSE
@ -58,8 +101,12 @@ popd
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/translations/*.qm
%{_datadir}/polkit-1/actions/com.deepin.pkexec.deepin-system-monitor.policy
%{_datadir}/deepin-manual/manual-assets/application/deepin-system-monitor/system-monitor/*
%changelog
* Tue Jul 19 2022 konglidong <konglidong@uniontech.com> - 5.8.11-1
- update to 5.8.11
* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.6.11.13-3
- fix build error
@ -71,4 +118,3 @@ popd
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-1
- Package init

99
modify-QPainterPath-error.patch
View File

@ -1,99 +0,0 @@
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 <DApplicationHelper>
+#include <QPainterPath>
#include <QWidget>
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 <DStyle>
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <QtMath>
#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 <DApplicationHelper>
+#include <QPainterPath>
#include <QWidget>
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 <QVBoxLayout>
#include <QWidget>
#include <QPropertyAnimation>
+#include <QPainterPath>
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 <DApplicationHelper>
+#include <QPainterPath>
#include <QWidget>
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 <QDebug>
#include <QPaintEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QtMath>
#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 <DStyle>
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <QtMath>
#include <QPropertyAnimation>
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 <DApplicationHelper>
#include <QIcon>
#include <QWidget>
+#include <QPainterPath>
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 <QImageReader>
#include <QLayout>
#include <QPainter>
+#include <QPainterPath>
#include <QPixmap>
#include <QStandardPaths>
#include <QString>