[arch-commits] Commit in deepin-system-monitor/trunk (PKGBUILD qt-5.14.patch)

[Felix Yan]

    Date: Wednesday, May 13, 2020 @ 12:38:40
  Author: felixonmars
Revision: 627648

upgpkg: deepin-system-monitor 5.6.2-1

Modified:
  deepin-system-monitor/trunk/PKGBUILD
  deepin-system-monitor/trunk/qt-5.14.patch

---------------+
 PKGBUILD      |    9 +++++----
 qt-5.14.patch |    3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-13 12:38:10 UTC (rev 627647)
+++ PKGBUILD	2020-05-13 12:38:40 UTC (rev 627648)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-system-monitor
-pkgver=5.6.1
+pkgver=5.6.2
 pkgrel=1
 pkgdesc='A more user-friendly system monitor'
 arch=('x86_64')
@@ -15,15 +15,16 @@
 install=deepin-system-monitor.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-system-monitor/archive/$pkgver.tar.gz"
         qt-5.14.patch)
-sha512sums=('2658e33da140c8c21e706cd8e97017d568c6a3b4bb6b46e80fc9b38f259d189d498303ff23f4af8a01c5adebd7e6f210bc3254612aa96ec4bb46adabb0ecde28'
-            'b565a12a8310909ff5d2f84f9b2df1b1bd9ac7f77d6c95ca83021527dbabbcdf0ec3aca1b4a90f4b3b6920c006393257a64e366b2070a9a43b75469695b74349')
+sha512sums=('dfc2b42ee89dc0c2c35fcb6387fe7b175f796e877cf002963f8d39cd458879767dedc351e3def4b8d3e2a98a4df265da1e60306aa37bcc8e1e45e2e5e1a32017'
+            '6e3efe9a52c6a1d1b221570c8c9997d5d88e57c8220cda29daa00263ef5578dcdf6d6dbf5721da8d055ec98ad01277458f2cfc9981fc034481b567d3f4c3940d')
 
 prepare() {
   cd deepin-system-monitor-$pkgver
   patch -p1 -i ../qt-5.14.patch
+  sed -i '/<QPixmap>/a #include <QUrl>' src/process/stats_collector.cpp
+
   rm -r nethogs
   sed -i 's|error("Build nethogs static library failed.")||' deepin-system-monitor.pro
-  echo > src/hashqstring.h
 
   sed -i 's/nethogsmonitor_loop(&onNethogsUpdate);/nethogsmonitor_loop(\&onNethogsUpdate, NULL, 1000);/' src/network_traffic_filter.cpp
 }

Modified: qt-5.14.patch
===================================================================
--- qt-5.14.patch	2020-05-13 12:38:10 UTC (rev 627647)
+++ qt-5.14.patch	2020-05-13 12:38:40 UTC (rev 627648)
@@ -101,5 +101,6 @@
  #include <unordered_set>
  #include "find_window_title.h"
 -#include "hashqstring.h"
+ #include <QDebug>
  
- DWM_USE_NAMESPACE
+ #include <QVariant>