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

[Felix Yan]

    Date: Friday, May 1, 2020 @ 17:09:57
  Author: felixonmars
Revision: 624086

upgpkg: deepin-system-monitor 5.6.1-1

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

---------------+
 PKGBUILD      |   13 ++++--
 qt-5.14.patch |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-01 17:08:43 UTC (rev 624085)
+++ PKGBUILD	2020-05-01 17:09:57 UTC (rev 624086)
@@ -3,21 +3,24 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-system-monitor
-pkgver=5.0.0
-pkgrel=3
+pkgver=5.6.1
+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')
-makedepends=('qt5-tools')
+makedepends=('deepin-gettext-tools' '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")
-sha512sums=('86694da7a50b703715a07bf4e7b8eb92f2cef1b0f9d854e415a2593bae4c6afa33f3283e89ce819f67ff05fcc5171041fb5e060756a1d50be8679ea16e2d9beb')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-system-monitor/archive/$pkgver.tar.gz"
+        qt-5.14.patch)
+sha512sums=('2658e33da140c8c21e706cd8e97017d568c6a3b4bb6b46e80fc9b38f259d189d498303ff23f4af8a01c5adebd7e6f210bc3254612aa96ec4bb46adabb0ecde28'
+            'b565a12a8310909ff5d2f84f9b2df1b1bd9ac7f77d6c95ca83021527dbabbcdf0ec3aca1b4a90f4b3b6920c006393257a64e366b2070a9a43b75469695b74349')
 
 prepare() {
   cd deepin-system-monitor-$pkgver
+  patch -p1 -i ../qt-5.14.patch
   rm -r nethogs
   sed -i 's|error("Build nethogs static library failed.")||' deepin-system-monitor.pro
   echo > src/hashqstring.h

Added: qt-5.14.patch
===================================================================
--- qt-5.14.patch	                        (rev 0)
+++ qt-5.14.patch	2020-05-01 17:09:57 UTC (rev 624086)
@@ -0,0 +1,105 @@
+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
++++ b/src/gui/process_table_view.cpp
+@@ -20,6 +20,7 @@
+ #include <QMessageBox>
+ #include <QProcess>
+ #include <QTimer>
++#include <QKeyEvent>
+ 
+ #include "kill_process_confirm_dialog.h"
+ #include "main_window.h"
+diff --git a/src/gui/system_service_table_view.cpp b/src/gui/system_service_table_view.cpp
+index 15d18b4..d1b1f8c 100644
+--- a/src/gui/system_service_table_view.cpp
++++ b/src/gui/system_service_table_view.cpp
+@@ -10,6 +10,7 @@
+ #include <QFutureWatcher>
+ #include <QScrollBar>
+ #include <QtConcurrent>
++#include <QKeyEvent>
+ 
+ #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"
+ 
+ DWM_USE_NAMESPACE