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

[Felix Yan]

    Date: Wednesday, June 24, 2020 @ 12:51:13
  Author: felixonmars
Revision: 652360

upgpkg: deepin-system-monitor 5.6.6-1

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

---------------+
 PKGBUILD      |   13 ++------
 qt-5.14.patch |   82 --------------------------------------------------------
 2 files changed, 4 insertions(+), 91 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-24 12:45:02 UTC (rev 652359)
+++ PKGBUILD	2020-06-24 12:51:13 UTC (rev 652360)
@@ -3,13 +3,13 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-system-monitor
-pkgver=5.6.5
+pkgver=5.6.6
 pkgrel=1
 pkgdesc='A more user-friendly system monitor'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-system-monitor"
 license=('GPL3')
-depends=('deepin-qt5integration' 'dtkwm' 'procps-ng' 'nethogs' 'libcap')
+depends=('deepin-qt5integration' 'dtkwm' 'procps-ng' 'libcap')
 makedepends=('deepin-gettext-tools' 'qt5-tools')
 groups=('deepin')
 install=deepin-system-monitor.install
@@ -16,8 +16,8 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-system-monitor/archive/$pkgver.tar.gz"
         qt-5.14.patch
         deepin-system-monitor-qt5.15.patch)
-sha512sums=('5b190cb96b0fb72b3e95be050f24b210f21371cae3fd6c7e6f9eb7c25fb59585fddeba9fbb65f215941da472f12e74a4c96e9b2973cb2393f2dab5c9ade3ccd3'
-            '423e6b528ac0e63986aedbac3f2065b985945f38a54fe3e818b841154b846d67379cac470c8e22c06d449a79cf2e7f29a007358adf4f86918d1078b789e1e612'
+sha512sums=('1b4bbc720a3b1be387f930b7f9cbe205237d4f2bcb8d97d09903521ff69a779e97870215a858d1c2a9a4e008a3a5f6e27d6879c2dae88ec8c5aab7ea60f2434c'
+            'c87ac75fdb2b9c70d8fdaf90a742e3090090521ce139903b1b0c4130ccaaa9c17c90ea511a42621c740d3b93aef7f91898686c832cb6e6c6434e59f010063a37'
             '45f9938885c6e29abf61174db3bc5654646baa7a8ec067ee4e048511eb62ae79996976c02d9275e8fdf1a7321dd0219b58ae54d8d370c5acf8346dd77959c608')
 
 prepare() {
@@ -26,11 +26,6 @@
   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
 
-  rm -r 3rdparty
-  sed -i 's|error("Build nethogs static library failed.")||' deepin-system-monitor.pro
-
-  sed -i 's/nethogsmonitor_loop(&onNethogsUpdate);/nethogsmonitor_loop(\&onNethogsUpdate, NULL, 1000);/' src/network_traffic_filter.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

Modified: qt-5.14.patch
===================================================================
--- qt-5.14.patch	2020-06-24 12:45:02 UTC (rev 652359)
+++ qt-5.14.patch	2020-06-24 12:51:13 UTC (rev 652360)
@@ -1,15 +1,3 @@
-diff --git a/deepin-system-monitor.pro b/deepin-system-monitor.pro
-index 4b41229..c30c6e9 100644
---- a/deepin-system-monitor.pro
-+++ b/deepin-system-monitor.pro
-@@ -39,7 +39,6 @@ HEADERS += src/utils.h \
-     src/compact_network_monitor.h \
-     src/compact_disk_monitor.h \
-     src/network_traffic_filter.h \
--    src/hashqstring.h \
-     src/find_window_title.h \
-     src/smooth_curve_generator.h \
-     src/interactive_kill.h \
 diff --git a/src/gui/process_table_view.cpp b/src/gui/process_table_view.cpp
 index 3a18329..ae0f4b5 100644
 --- a/src/gui/process_table_view.cpp
@@ -34,73 +22,3 @@
  
  #include "common/error_context.h"
  #include "main_window.h"
-diff --git a/src/hashqstring.h b/src/hashqstring.h
-deleted file mode 100644
-index 20522b3..0000000
---- a/src/hashqstring.h
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* -*- Mode: C++; indent-tabs-mode: nil; tab-width: 4 -*-
-- * -*- coding: utf-8 -*-
-- *
-- * Copyright (C) 2011 ~ 2018 Deepin, Inc.
-- *               2011 ~ 2018 Wang Yong
-- *
-- * Author:     Wang Yong <wangyong at deepin.com>
-- * Maintainer: Wang Yong <wangyong at deepin.com>
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation, either version 3 of the License, or
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */ 
--
--#ifndef HASHQSTRING_H
--#define HASHQSTRING_H
--
--#include <QString>
--#include <string>
--
--namespace std {
--    template<> struct hash<QString>
--    {
--        size_t operator()(const QString& k) const
--            {
--                return hash<string>()(k.toStdString());
--            }
--    };
--}
--
--#endif // HASHQSTRING_H
-diff --git a/src/utils.cpp b/src/utils.cpp
-index 054025e..4d19745 100644
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -49,7 +49,6 @@
- 
- #include <X11/extensions/shape.h>
- 
--#include "hashqstring.h"
- #include "utils.h"
- 
- DCORE_USE_NAMESPACE
-diff --git a/src/utils.h b/src/utils.h
-index 747b445..7248711 100644
---- a/src/utils.h
-+++ b/src/utils.h
-@@ -32,6 +32,5 @@
- #include <QString>
- #include <unordered_set>
- #include "find_window_title.h"
--#include "hashqstring.h"
- #include <QDebug>
- 
- #include <QVariant>