Hello community,
here is the log from the commit of package deepin-system-monitor for
openSUSE:Factory checked in at 2020-06-25 15:09:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-system-monitor"
Thu Jun 25 15:09:31 2020 rev:5 rq:816972 version:1.5.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2020-01-27 00:23:27.225525720 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.3060/deepin-system-monitor.changes
2020-06-25 15:10:47.449998392 +0200
@@ -1,0 +2,6 @@
+Thu Jun 25 07:32:37 UTC 2020 - Hillwood Yang <[email protected]>
+
+- Add deepin-system-monitor-Qt-5_15.patch
+ * Support Qt 5.15
+
+-------------------------------------------------------------------
Old:
----
deepin-system-monitor-appdata.xml
New:
----
deepin-system-monitor-Qt-5_15.patch
deepin-system-monitor.appdata.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.t8vT1D/_old 2020-06-25 15:10:48.418001430 +0200
+++ /var/tmp/diff_new_pack.t8vT1D/_new 2020-06-25 15:10:48.418001430 +0200
@@ -24,9 +24,11 @@
Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-system-monitor
Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
-Source1: %{name}-appdata.xml
+Source1: %{name}.appdata.xml
# PATCH-FIX-UPSTEAM Fix-redefinition-error.patch [email protected] - Fix
redefinition of 'struct std::hash<QString>' error
Patch0: Fix-redefinition-error.patch
+# PATCH-FIX-UPSTEAM deepin-system-monitor-Qt-5_15.patch [email protected]
- Support Qt 5.15
+Patch1: %{name}-Qt-5_15.patch
BuildRequires: appstream-glib
BuildRequires: desktop-file-utils
BuildRequires: dtkcore
@@ -62,6 +64,9 @@
%prep
%setup -q
%patch0 -p1
+%if 0%{?suse_version} > 1500
+%patch1 -p1
+%endif
sed -i 's/lrelease/lrelease-qt5/g' translations/translate_generation.sh
%build
++++++ deepin-system-monitor-Qt-5_15.patch ++++++
diff -Nur deepin-system-monitor-1.5.2/src/attributes_dialog.cpp
deepin-system-monitor-1.5.2-new/src/attributes_dialog.cpp
--- deepin-system-monitor-1.5.2/src/attributes_dialog.cpp 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/attributes_dialog.cpp 2020-06-25
15:23:23.566430434 +0800
@@ -28,6 +28,7 @@
#include <QDateTime>
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <dthememanager.h>
#include <proc/readproc.h>
#include <proc/sysinfo.h>
diff -Nur deepin-system-monitor-1.5.2/src/compact_cpu_monitor.h
deepin-system-monitor-1.5.2-new/src/compact_cpu_monitor.h
--- deepin-system-monitor-1.5.2/src/compact_cpu_monitor.h 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/compact_cpu_monitor.h 2020-06-25
15:23:54.962272807 +0800
@@ -24,6 +24,7 @@
#ifndef COMPACTCPUMONITOR_H
#define COMPACTCPUMONITOR_H
+#include <QPainterPath>
#include <QWidget>
class CompactCpuMonitor : public QWidget
diff -Nur deepin-system-monitor-1.5.2/src/compact_disk_monitor.h
deepin-system-monitor-1.5.2-new/src/compact_disk_monitor.h
--- deepin-system-monitor-1.5.2/src/compact_disk_monitor.h 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/compact_disk_monitor.h 2020-06-25
15:24:15.466169852 +0800
@@ -24,6 +24,7 @@
#ifndef COMPACTDISKMONITOR_H
#define COMPACTDISKMONITOR_H
+#include <QPainterPath>
#include <QWidget>
class CompactDiskMonitor : public QWidget
diff -Nur deepin-system-monitor-1.5.2/src/compact_network_monitor.h
deepin-system-monitor-1.5.2-new/src/compact_network_monitor.h
--- deepin-system-monitor-1.5.2/src/compact_network_monitor.h 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/compact_network_monitor.h
2020-06-25 15:24:34.434074609 +0800
@@ -24,6 +24,7 @@
#ifndef COMPACTNETWORKMONITOR_H
#define COMPACTNETWORKMONITOR_H
+#include <QPainterPath>
#include <QWidget>
class CompactNetworkMonitor : public QWidget
diff -Nur deepin-system-monitor-1.5.2/src/cpu_monitor.h
deepin-system-monitor-1.5.2-new/src/cpu_monitor.h
--- deepin-system-monitor-1.5.2/src/cpu_monitor.h 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/cpu_monitor.h 2020-06-25
15:24:55.097970849 +0800
@@ -26,6 +26,7 @@
#include <QList>
#include <QPointF>
+#include <QPainterPath>
#include <QTimer>
#include <QVBoxLayout>
#include <QWidget>
diff -Nur deepin-system-monitor-1.5.2/src/disk_monitor.h
deepin-system-monitor-1.5.2-new/src/disk_monitor.h
--- deepin-system-monitor-1.5.2/src/disk_monitor.h 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/disk_monitor.h 2020-06-25
15:25:09.697897540 +0800
@@ -24,6 +24,7 @@
#ifndef DISKMONITOR_H
#define DISKMONITOR_H
+#include <QPainterPath>
#include <QWidget>
class DiskMonitor : public QWidget
diff -Nur deepin-system-monitor-1.5.2/src/network_monitor.h
deepin-system-monitor-1.5.2-new/src/network_monitor.h
--- deepin-system-monitor-1.5.2/src/network_monitor.h 2019-05-23
18:03:34.000000000 +0800
+++ deepin-system-monitor-1.5.2-new/src/network_monitor.h 2020-06-25
15:25:26.465813343 +0800
@@ -24,6 +24,7 @@
#ifndef NETWORKMONITOR_H
#define NETWORKMONITOR_H
+#include <QPainterPath>
#include <QWidget>
class NetworkMonitor : public QWidget
diff -Nur deepin-system-monitor-1.5.2/src/utils.h
deepin-system-monitor-1.5.2-new/src/utils.h
--- deepin-system-monitor-1.5.2/src/utils.h 2019-05-23 18:03:34.000000000
+0800
+++ deepin-system-monitor-1.5.2-new/src/utils.h 2020-06-25 15:26:43.777425141
+0800
@@ -30,6 +30,7 @@
#include <QLayout>
#include <QObject>
#include <QPainter>
+#include <QPainterPath>
#include <QString>
#include <proc/readproc.h>
#include <unordered_set>
++++++ deepin-system-monitor-appdata.xml -> deepin-system-monitor.appdata.xml
++++++
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-appdata.xml
2019-09-27 14:53:27.163983993 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.3060/deepin-system-monitor.appdata.xml
2020-06-25 15:10:47.389998204 +0200
@@ -25,8 +25,14 @@
<project_license>GPL-3.0</project_license>
<developer_name>Linux Deepin</developer_name>
<screenshots>
- <screenshot
type="default">https://www.deepin.org/wp-content/uploads/2017/06/deepin-system-monitor_en-1.png</screenshot>
- <screenshot
type="default">https://www.deepin.org/wp-content/uploads/2017/06/deepin-system-monitor_en-2.png</screenshot>
- <screenshot
type="default">https://www.deepin.org/wp-content/uploads/2017/06/deepin-system-monitor_en-3.png</screenshot>
+ <screenshot type="default">
+
<image>https://www.deepin.org/wp-content/uploads/2017/06/deepin-system-monitor_en-1.png</image>
+ </screenshot>
+ <screenshot type="default">
+
<image>https://www.deepin.org/wp-content/uploads/2017/06/deepin-system-monitor_en-2.png</image>
+ </screenshot>
+ <screenshot type="default">
+
<image>https://www.deepin.org/wp-content/uploads/2017/06/deepin-system-monitor_en-3.png</image>
+ </screenshot>
</screenshots>
</component>
