From c2335b14cbbefff4d4606950815bc4d65b8b9304 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 11 Nov 2020 15:43:06 +0100 Subject: [PATCH] Remove package: deepin-system-monitor --- .../patches/QPainterPath.patch | 160 ------------------ .../patches/qt5.14.patch | 28 --- srcpkgs/deepin-system-monitor/template | 22 --- 3 files changed, 210 deletions(-) delete mode 100644 srcpkgs/deepin-system-monitor/patches/QPainterPath.patch delete mode 100644 srcpkgs/deepin-system-monitor/patches/qt5.14.patch delete mode 100644 srcpkgs/deepin-system-monitor/template diff --git a/srcpkgs/deepin-system-monitor/patches/QPainterPath.patch b/srcpkgs/deepin-system-monitor/patches/QPainterPath.patch deleted file mode 100644 index e221eedf301..00000000000 --- a/srcpkgs/deepin-system-monitor/patches/QPainterPath.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- src/attributes_dialog.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/attributes_dialog.cpp 2020-09-01 18:02:43.625672222 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- src/compact_cpu_monitor.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/compact_cpu_monitor.cpp 2020-09-01 18:03:48.469675568 +0200 -@@ -28,6 +28,7 @@ - #include "utils.h" - #include - #include -+#include - #include - #include - ---- src/compact_cpu_monitor.h 2019-05-23 12:03:34.000000000 +0200 -+++ src/compact_cpu_monitor.h 2020-09-01 18:03:41.773675222 +0200 -@@ -24,6 +24,7 @@ - #ifndef COMPACTCPUMONITOR_H - #define COMPACTCPUMONITOR_H - -+#include - #include - - class CompactCpuMonitor : public QWidget ---- src/compact_disk_monitor.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/compact_disk_monitor.cpp 2020-09-01 18:05:07.969679669 +0200 -@@ -28,6 +28,7 @@ - #include "utils.h" - #include - #include -+#include - #include - #include - ---- src/compact_disk_monitor.h 2019-05-23 12:03:34.000000000 +0200 -+++ src/compact_disk_monitor.h 2020-09-01 18:03:33.882674815 +0200 -@@ -24,6 +24,7 @@ - #ifndef COMPACTDISKMONITOR_H - #define COMPACTDISKMONITOR_H - -+#include - #include - - class CompactDiskMonitor : public QWidget ---- src/compact_network_monitor.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/compact_network_monitor.cpp 2020-09-01 18:02:59.925673063 +0200 -@@ -28,6 +28,7 @@ - #include "utils.h" - #include - #include -+#include - #include - #include - ---- src/compact_network_monitor.h 2019-05-23 12:03:34.000000000 +0200 -+++ src/compact_network_monitor.h 2020-09-01 18:03:57.463676032 +0200 -@@ -24,6 +24,7 @@ - #ifndef COMPACTNETWORKMONITOR_H - #define COMPACTNETWORKMONITOR_H - -+#include - #include - - class CompactNetworkMonitor : public QWidget ---- src/cpu_monitor.h 2019-05-23 12:03:34.000000000 +0200 -+++ src/cpu_monitor.h 2020-09-01 18:03:12.705673723 +0200 -@@ -25,6 +25,7 @@ - #define CpuMONITOR_H - - #include -+#include - #include - #include - #include ---- src/disk_monitor.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/disk_monitor.cpp 2020-09-01 18:02:36.901671876 +0200 -@@ -28,6 +28,7 @@ - #include "utils.h" - #include - #include -+#include - #include - #include - ---- src/disk_monitor.h 2019-05-23 12:03:34.000000000 +0200 -+++ src/disk_monitor.h 2020-09-01 18:02:53.669672741 +0200 -@@ -24,6 +24,7 @@ - #ifndef DISKMONITOR_H - #define DISKMONITOR_H - -+#include - #include - - class DiskMonitor : public QWidget ---- src/main_window.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/main_window.cpp 2020-09-01 18:04:54.944678997 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- src/network_monitor.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/network_monitor.cpp 2020-09-01 18:05:13.757679968 +0200 -@@ -28,6 +28,7 @@ - #include "utils.h" - #include - #include -+#include - #include - #include - ---- src/network_monitor.h 2019-05-23 12:03:34.000000000 +0200 -+++ src/network_monitor.h 2020-09-01 18:04:19.213677154 +0200 -@@ -24,6 +24,7 @@ - #ifndef NETWORKMONITOR_H - #define NETWORKMONITOR_H - -+#include - #include - - class NetworkMonitor : public QWidget ---- src/process_item.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/process_item.cpp 2020-09-01 18:04:11.593676761 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include "chinese2pinyin.h" - - DWIDGET_USE_NAMESPACE ---- src/process_switch_tab.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/process_switch_tab.cpp 2020-09-01 18:04:32.500677839 +0200 -@@ -26,6 +26,7 @@ - #include "utils.h" - #include - #include -+#include - - DWIDGET_USE_NAMESPACE - ---- src/utils.cpp 2019-05-23 12:03:34.000000000 +0200 -+++ src/utils.cpp 2020-09-01 18:05:02.184679371 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/deepin-system-monitor/patches/qt5.14.patch b/srcpkgs/deepin-system-monitor/patches/qt5.14.patch deleted file mode 100644 index 061ea5cb110..00000000000 --- a/srcpkgs/deepin-system-monitor/patches/qt5.14.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 014ec783c9bf11ae352934ee2e593f29700b2843 Mon Sep 17 00:00:00 2001 -From: Hillwood Yang -Date: Sat, 25 Jan 2020 20:39:39 +0800 -Subject: [PATCH] Fix hash error above Qt 5.14 - ---- - src/hashqstring.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/hashqstring.h b/src/hashqstring.h -index 20522b3..71d71c4 100644 ---- src/hashqstring.h -+++ src/hashqstring.h -@@ -27,6 +27,7 @@ - #include - #include - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - namespace std { - template<> struct hash - { -@@ -36,5 +37,6 @@ namespace std { - } - }; - } -+#endif - - #endif // HASHQSTRING_H diff --git a/srcpkgs/deepin-system-monitor/template b/srcpkgs/deepin-system-monitor/template deleted file mode 100644 index 9a6dd826ec3..00000000000 --- a/srcpkgs/deepin-system-monitor/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'deepin-system-monitor' -pkgname=deepin-system-monitor -version=5.0.0 -revision=2 -build_style=qmake -hostmakedepends="qt5-qmake pkg-config qt5-host-tools" -makedepends="dtkwm-devel dtkwidget-devel qt5-x11extras-devel libpcap-devel - procps-ng-devel libxcb-devel libXtst-devel xcb-util-devel" -depends="qt5integration" -short_desc="User-friendly system monitor for Deepin" -maintainer="John " -license="GPL-3.0-or-later" -homepage="https://github.com/linuxdeepin/deepin-system-monitor" -changelog="https://github.com/linuxdeepin/deepin-system-monitor/blob/${version}/CHANGELOG.md" -distfiles="https://github.com/linuxdeepin/deepin-system-monitor/archive/${version}.tar.gz" -checksum=5af4f6c321719937f47a07929bc94dd4de8b64a977bcc32355620d2606ee0de9 - -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.16/DWm" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-x11extras-devel" -fi