[arch-commits] Commit in deepin-system-monitor/trunk (2 files)

Felix Yan felixonmars at archlinux.org
Tue Jul 14 10:55:09 UTC 2020


    Date: Tuesday, July 14, 2020 @ 10:55:09
  Author: felixonmars
Revision: 663682

upgpkg: deepin-system-monitor 5.6.12-1

Modified:
  deepin-system-monitor/trunk/PKGBUILD
Deleted:
  deepin-system-monitor/trunk/deepin-system-monitor-qt5.15.patch

------------------------------------+
 PKGBUILD                           |   20 ++--
 deepin-system-monitor-qt5.15.patch |  144 -----------------------------------
 2 files changed, 12 insertions(+), 152 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-14 10:46:51 UTC (rev 663681)
+++ PKGBUILD	2020-07-14 10:55:09 UTC (rev 663682)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-system-monitor
-pkgver=5.6.11
+pkgver=5.6.12
 pkgrel=1
 pkgdesc='A more user-friendly system monitor'
 arch=('x86_64')
@@ -13,16 +13,20 @@
 makedepends=('cmake' 'deepin-gettext-tools' 'ninja' 'qt5-tools')
 groups=('deepin')
 install=deepin-system-monitor.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-system-monitor/archive/$pkgver.tar.gz"
-        deepin-system-monitor-qt5.15.patch)
-sha512sums=('0a7092dd383e65753c2c2f6bccbad6b7cfd5cf2be02831eac2cdf504ccd7d3ebf1e59acf3d883e18ec4f2e004fb2a5206a566b8ca07f25a7ae7f0e728a2e8b37'
-            '45f9938885c6e29abf61174db3bc5654646baa7a8ec067ee4e048511eb62ae79996976c02d9275e8fdf1a7321dd0219b58ae54d8d370c5acf8346dd77959c608')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-system-monitor/archive/$pkgver.tar.gz")
+sha512sums=('afce9851051506669dfe0d8e5c8ae2a302b8ba1a4010768c348b716f3be1f4c24befcf2d13fbb632c0fbfe726ef10c0a5e550263cae318d3678d7bb92dc62482')
 
 prepare() {
   cd deepin-system-monitor-$pkgver
-  patch -p1 -i ../deepin-system-monitor-qt5.15.patch # Fix build with Qt 5.15
-  sed -i '/<QPixmap>/a #include <QUrl>' src/process/stats_collector.cpp
-
+# Upstream likes to refactor code while ignoring pull requests
+  sed -i '20i#include <QMap>\n#include <QHash>\n#include <QPainterPath>' src/compact_memory_monitor.cpp
+  sed -i '1i#include <QPainterPath>' src/memory_monitor.cpp src/compact_network_monitor.h \
+                                     src/network_monitor.h src/utils.cpp \
+                                     src/gui/system_service_page_widget.cpp \
+                                     src/gui/process_page_widget.cpp \
+                                     src/gui/base_header_view.cpp src/disk_monitor.h \
+                                     src/cpu_monitor.h src/compact_disk_monitor.h \
+                                     src/compact_cpu_monitor.cpp
 # Workaround build failure with GCC 10
   sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
   sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp

Deleted: deepin-system-monitor-qt5.15.patch
===================================================================
--- deepin-system-monitor-qt5.15.patch	2020-07-14 10:46:51 UTC (rev 663681)
+++ deepin-system-monitor-qt5.15.patch	2020-07-14 10:55:09 UTC (rev 663682)
@@ -1,144 +0,0 @@
-diff --git a/src/compact_cpu_monitor.cpp b/src/compact_cpu_monitor.cpp
-index c703ed8..2e04db9 100644
---- a/src/compact_cpu_monitor.cpp
-+++ b/src/compact_cpu_monitor.cpp
-@@ -29,6 +29,7 @@
- #include <QApplication>
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QtMath>
- 
- #include "compact_cpu_monitor.h"
-diff --git a/src/compact_disk_monitor.h b/src/compact_disk_monitor.h
-index 54868a9..57a9fa6 100644
---- a/src/compact_disk_monitor.h
-+++ b/src/compact_disk_monitor.h
-@@ -26,6 +26,7 @@
- 
- #include <DApplicationHelper>
- #include <QWidget>
-+#include <QPainterPath>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/src/compact_memory_monitor.cpp b/src/compact_memory_monitor.cpp
-index 80e5088..e5b9bf7 100644
---- a/src/compact_memory_monitor.cpp
-+++ b/src/compact_memory_monitor.cpp
-@@ -28,6 +28,7 @@
- #include <DStyle>
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QtMath>
- 
- #include "compact_memory_monitor.h"
-diff --git a/src/compact_network_monitor.h b/src/compact_network_monitor.h
-index c6f80d0..18830e8 100644
---- a/src/compact_network_monitor.h
-+++ b/src/compact_network_monitor.h
-@@ -26,6 +26,7 @@
- 
- #include <DApplicationHelper>
- #include <QWidget>
-+#include <QPainterPath>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/src/cpu_monitor.h b/src/cpu_monitor.h
-index fccdb9d..dd0b05a 100644
---- a/src/cpu_monitor.h
-+++ b/src/cpu_monitor.h
-@@ -32,6 +32,7 @@
- #include <QVBoxLayout>
- #include <QWidget>
- #include <QPropertyAnimation>
-+#include <QPainterPath>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/src/disk_monitor.h b/src/disk_monitor.h
-index 05ec296..b10a225 100644
---- a/src/disk_monitor.h
-+++ b/src/disk_monitor.h
-@@ -26,6 +26,7 @@
- 
- #include <DApplicationHelper>
- #include <QWidget>
-+#include <QPainterPath>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/src/gui/base_header_view.cpp b/src/gui/base_header_view.cpp
-index bfaebda..bab7b22 100644
---- a/src/gui/base_header_view.cpp
-+++ b/src/gui/base_header_view.cpp
-@@ -7,6 +7,7 @@
- #include <QDebug>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QtMath>
- 
- #include "base_header_view.h"
-diff --git a/src/gui/process_page_widget.cpp b/src/gui/process_page_widget.cpp
-index 8bce954..a951974 100644
---- a/src/gui/process_page_widget.cpp
-+++ b/src/gui/process_page_widget.cpp
-@@ -40,6 +40,7 @@
- #include <QMessageBox>
- #include <QStyleFactory>
- #include <QVBoxLayout>
-+#include <QPainterPath>
- 
- #include "constant.h"
- #include "kill_process_confirm_dialog.h"
-diff --git a/src/gui/system_service_page_widget.cpp b/src/gui/system_service_page_widget.cpp
-index af27fde..cf861d7 100644
---- a/src/gui/system_service_page_widget.cpp
-+++ b/src/gui/system_service_page_widget.cpp
-@@ -3,6 +3,7 @@
- #include <DStyle>
- #include <DStyleHelper>
- #include <QHBoxLayout>
-+#include <QPainterPath>
- 
- #include "main_window.h"
- #include "system_service_page_widget.h"
-diff --git a/src/memory_monitor.cpp b/src/memory_monitor.cpp
-index 849f337..e90a01a 100644
---- a/src/memory_monitor.cpp
-+++ b/src/memory_monitor.cpp
-@@ -28,6 +28,7 @@
- #include <DStyle>
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QtMath>
- #include <QPropertyAnimation>
- 
-diff --git a/src/network_monitor.h b/src/network_monitor.h
-index f14d329..3049ce2 100644
---- a/src/network_monitor.h
-+++ b/src/network_monitor.h
-@@ -27,6 +27,7 @@
- #include <DApplicationHelper>
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/src/utils.cpp b/src/utils.cpp
-index 054025e..f9646f5 100644
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -39,6 +39,7 @@
- #include <QImageReader>
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QStandardPaths>
- #include <QString>


More information about the arch-commits mailing list