Date: Tuesday, June 30, 2020 @ 09:27:51
  Author: felixonmars
Revision: 657117

archrelease: copy trunk to community-x86_64

Added:
  deepin-system-monitor/repos/community-x86_64/PKGBUILD
    (from rev 657116, deepin-system-monitor/trunk/PKGBUILD)
  
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor-qt5.15.patch
    (from rev 657116, 
deepin-system-monitor/trunk/deepin-system-monitor-qt5.15.patch)
  deepin-system-monitor/repos/community-x86_64/deepin-system-monitor.install
    (from rev 657116, deepin-system-monitor/trunk/deepin-system-monitor.install)
Deleted:
  deepin-system-monitor/repos/community-x86_64/PKGBUILD
  
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor-qt5.15.patch
  deepin-system-monitor/repos/community-x86_64/deepin-system-monitor.install
  deepin-system-monitor/repos/community-x86_64/qt-5.14.patch

------------------------------------+
 PKGBUILD                           |   85 ++++------
 deepin-system-monitor-qt5.15.patch |  288 +++++++++++++++++------------------
 deepin-system-monitor.install      |   14 -
 qt-5.14.patch                      |   24 --
 4 files changed, 192 insertions(+), 219 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2020-06-30 09:27:21 UTC (rev 657116)
+++ PKGBUILD    2020-06-30 09:27:51 UTC (rev 657117)
@@ -1,44 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-system-monitor
-pkgver=5.6.7
-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' 'libcap')
-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";
-        qt-5.14.patch
-        deepin-system-monitor-qt5.15.patch)
-sha512sums=('ad290bc9cd4e69119b6671b8a80a44c6453f5113f5eba90d8cb67790ebaa0b0f277fc3b23f0cae794c4a09b145444a588c8de9c149aeeffcb1927253f91149cf'
-            
'c87ac75fdb2b9c70d8fdaf90a742e3090090521ce139903b1b0c4130ccaaa9c17c90ea511a42621c740d3b93aef7f91898686c832cb6e6c6434e59f010063a37'
-            
'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
-
-# 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
-  sed -e 's|print_err|print_err_desktop|g' -i 
src/process/desktop_entry_stat.cpp
-}
-
-build() {
-  cd deepin-system-monitor-$pkgver
-  qmake-qt5 PREFIX=/usr
-  make
-}
-
-package() {
-  cd deepin-system-monitor-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: deepin-system-monitor/repos/community-x86_64/PKGBUILD (from rev 657116, 
deepin-system-monitor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2020-06-30 09:27:51 UTC (rev 657117)
@@ -0,0 +1,41 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-system-monitor
+pkgver=5.6.8
+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' 'libcap')
+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";
+        deepin-system-monitor-qt5.15.patch)
+sha512sums=('a1053dfd9fee6c234a60ad21c59733ec997da01270e02ecf9c505a6b083b1c93eb05a7b533e449055f2228e77cb3c21654a78368da92b7ea62da01f51b5fb52e'
+            
'45f9938885c6e29abf61174db3bc5654646baa7a8ec067ee4e048511eb62ae79996976c02d9275e8fdf1a7321dd0219b58ae54d8d370c5acf8346dd77959c608')
+
+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
+
+# 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
+  sed -e 's|print_err|print_err_desktop|g' -i 
src/process/desktop_entry_stat.cpp
+}
+
+build() {
+  cd deepin-system-monitor-$pkgver
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd deepin-system-monitor-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: deepin-system-monitor-qt5.15.patch
===================================================================
--- deepin-system-monitor-qt5.15.patch  2020-06-30 09:27:21 UTC (rev 657116)
+++ deepin-system-monitor-qt5.15.patch  2020-06-30 09:27:51 UTC (rev 657117)
@@ -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>

Copied: 
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor-qt5.15.patch 
(from rev 657116, 
deepin-system-monitor/trunk/deepin-system-monitor-qt5.15.patch)
===================================================================
--- deepin-system-monitor-qt5.15.patch                          (rev 0)
+++ deepin-system-monitor-qt5.15.patch  2020-06-30 09:27:51 UTC (rev 657117)
@@ -0,0 +1,144 @@
+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>

Deleted: deepin-system-monitor.install
===================================================================
--- deepin-system-monitor.install       2020-06-30 09:27:21 UTC (rev 657116)
+++ deepin-system-monitor.install       2020-06-30 09:27:51 UTC (rev 657117)
@@ -1,7 +0,0 @@
-post_install() {
-  setcap cap_kill,cap_net_raw,cap_dac_read_search,cap_sys_ptrace+ep 
usr/bin/deepin-system-monitor
-}
-
-post_upgrade() {
-  post_install
-}

Copied: 
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor.install 
(from rev 657116, deepin-system-monitor/trunk/deepin-system-monitor.install)
===================================================================
--- deepin-system-monitor.install                               (rev 0)
+++ deepin-system-monitor.install       2020-06-30 09:27:51 UTC (rev 657117)
@@ -0,0 +1,7 @@
+post_install() {
+  setcap cap_kill,cap_net_raw,cap_dac_read_search,cap_sys_ptrace+ep 
usr/bin/deepin-system-monitor
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: qt-5.14.patch
===================================================================
--- qt-5.14.patch       2020-06-30 09:27:21 UTC (rev 657116)
+++ qt-5.14.patch       2020-06-30 09:27:51 UTC (rev 657117)
@@ -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"

Reply via email to