[arch-commits] Commit in deepin-system-monitor/repos/community-x86_64 (7 files)
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
===
--- PKGBUILD2020-06-30 09:27:21 UTC (rev 657116)
+++ PKGBUILD2020-06-30 09:27:51 UTC (rev 657117)
@@ -1,44 +0,0 @@
-# Maintainer: Felix Yan
-# Contributor: Josip Ponjavic
-# Contributor: Xu Fasheng
-
-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 '//a #include ' 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)
+++ PKGBUILD2020-06-30 09:27:51 UTC (rev 657117)
@@ -0,0 +1,41 @@
+# Maintainer: Felix Yan
+# Contributor: Josip Ponjavic
+# Contributor: Xu Fasheng
+
+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 '//a #include ' 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
[arch-commits] Commit in deepin-system-monitor/repos/community-x86_64 (7 files)
Date: Thursday, May 28, 2020 @ 10:50:02
Author: felixonmars
Revision: 636240
archrelease: copy trunk to community-x86_64
Added:
deepin-system-monitor/repos/community-x86_64/PKGBUILD
(from rev 636239, deepin-system-monitor/trunk/PKGBUILD)
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor-qt5.15.patch
(from rev 636239,
deepin-system-monitor/trunk/deepin-system-monitor-qt5.15.patch)
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor.install
(from rev 636239, deepin-system-monitor/trunk/deepin-system-monitor.install)
deepin-system-monitor/repos/community-x86_64/qt-5.14.patch
(from rev 636239, deepin-system-monitor/trunk/qt-5.14.patch)
Deleted:
deepin-system-monitor/repos/community-x86_64/PKGBUILD
deepin-system-monitor/repos/community-x86_64/deepin-system-monitor.install
deepin-system-monitor/repos/community-x86_64/qt-5.14.patch
+
PKGBUILD | 90 --
deepin-system-monitor-qt5.15.patch | 144 +++
deepin-system-monitor.install | 14 +-
qt-5.14.patch | 212 +--
4 files changed, 306 insertions(+), 154 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2020-05-28 10:49:42 UTC (rev 636239)
+++ PKGBUILD2020-05-28 10:50:02 UTC (rev 636240)
@@ -1,41 +0,0 @@
-# Maintainer: Felix Yan
-# Contributor: Josip Ponjavic
-# Contributor: Xu Fasheng
-
-pkgname=deepin-system-monitor
-pkgver=5.6.2
-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=('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)
-sha512sums=('dfc2b42ee89dc0c2c35fcb6387fe7b175f796e877cf002963f8d39cd458879767dedc351e3def4b8d3e2a98a4df265da1e60306aa37bcc8e1e45e2e5e1a32017'
-
'6e3efe9a52c6a1d1b221570c8c9997d5d88e57c8220cda29daa00263ef5578dcdf6d6dbf5721da8d055ec98ad01277458f2cfc9981fc034481b567d3f4c3940d')
-
-prepare() {
- cd deepin-system-monitor-$pkgver
- patch -p1 -i ../qt-5.14.patch
- sed -i '//a #include ' src/process/stats_collector.cpp
-
- rm -r nethogs
- sed -i 's|error("Build nethogs static library failed.")||'
deepin-system-monitor.pro
-
- sed -i
's/nethogsmonitor_loop();/nethogsmonitor_loop(\,
NULL, 1000);/' src/network_traffic_filter.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 636239,
deepin-system-monitor/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2020-05-28 10:50:02 UTC (rev 636240)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan
+# Contributor: Josip Ponjavic
+# Contributor: Xu Fasheng
+
+pkgname=deepin-system-monitor
+pkgver=5.6.3
+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=('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=('f7148235a08dd002e4b96bf4b02c761dcfde60f86815c7c039d79e427fd17aa21d9fd85dbafca9fb9a35da942891e4383142eff68549d0284d8b88598064b00e'
+
'423e6b528ac0e63986aedbac3f2065b985945f38a54fe3e818b841154b846d67379cac470c8e22c06d449a79cf2e7f29a007358adf4f86918d1078b789e1e612'
+
'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 '//a #include ' src/process/stats_collector.cpp
+
+ rm -r nethogs
+ sed -i 's|error("Build nethogs static library failed.")||'
deepin-system-monitor.pro
+
+ sed -i
's/nethogsmonitor_loop();/nethogsmonitor_loop(\,
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
+ sed -e 's|print_err|print_err_desktop|g' -i
src/process/desktop_entry_stat.cpp
+}
