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

[Felix Yan]

    Date: Tuesday, June 30, 2020 @ 09:27:21
  Author: felixonmars
Revision: 657116

upgpkg: deepin-system-monitor 5.6.8-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-30 09:24:16 UTC (rev 657115)
+++ PKGBUILD	2020-06-30 09:27:21 UTC (rev 657116)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-system-monitor
-pkgver=5.6.7
+pkgver=5.6.8
 pkgrel=1
 pkgdesc='A more user-friendly system monitor'
 arch=('x86_64')
@@ -10,19 +10,16 @@
 url="https://github.com/linuxdeepin/deepin-system-monitor"
 license=('GPL3')
 depends=('deepin-qt5integration' 'dtkwm' 'procps-ng' 'libcap')
-makedepends=('deepin-gettext-tools' 'qt5-tools')
+makedepends=('cmake' '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"
-        qt-5.14.patch
         deepin-system-monitor-qt5.15.patch)
-sha512sums=('ad290bc9cd4e69119b6671b8a80a44c6453f5113f5eba90d8cb67790ebaa0b0f277fc3b23f0cae794c4a09b145444a588c8de9c149aeeffcb1927253f91149cf'
-            'c87ac75fdb2b9c70d8fdaf90a742e3090090521ce139903b1b0c4130ccaaa9c17c90ea511a42621c740d3b93aef7f91898686c832cb6e6c6434e59f010063a37'
+sha512sums=('a1053dfd9fee6c234a60ad21c59733ec997da01270e02ecf9c505a6b083b1c93eb05a7b533e449055f2228e77cb3c21654a78368da92b7ea62da01f51b5fb52e'
             '45f9938885c6e29abf61174db3bc5654646baa7a8ec067ee4e048511eb62ae79996976c02d9275e8fdf1a7321dd0219b58ae54d8d370c5acf8346dd77959c608')
 
 prepare() {
   cd deepin-system-monitor-$pkgver
-  patch -p1 -i ../qt-5.14.patch
   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
 
@@ -34,11 +31,11 @@
 
 build() {
   cd deepin-system-monitor-$pkgver
-  qmake-qt5 PREFIX=/usr
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
   cd deepin-system-monitor-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 }

Deleted: qt-5.14.patch
===================================================================
--- qt-5.14.patch	2020-06-30 09:24:16 UTC (rev 657115)
+++ qt-5.14.patch	2020-06-30 09:27:21 UTC (rev 657116)
@@ -1,24 +0,0 @@
-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"