Date: Tuesday, May 26, 2020 @ 16:54:52 Author: arojas Revision: 635139
Qt 5.15 rebuild Added: deepin-system-monitor/trunk/deepin-system-monitor-qt5.15.patch Modified: deepin-system-monitor/trunk/PKGBUILD ------------------------------------+ PKGBUILD | 14 ++- deepin-system-monitor-qt5.15.patch | 144 +++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-26 16:40:48 UTC (rev 635138) +++ PKGBUILD 2020-05-26 16:54:52 UTC (rev 635139) @@ -4,7 +4,7 @@ pkgname=deepin-system-monitor pkgver=5.6.2 -pkgrel=1 +pkgrel=2 pkgdesc='A more user-friendly system monitor' arch=('x86_64') url="https://github.com/linuxdeepin/deepin-system-monitor" @@ -14,13 +14,16 @@ 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) + qt-5.14.patch + deepin-system-monitor-qt5.15.patch) sha512sums=('dfc2b42ee89dc0c2c35fcb6387fe7b175f796e877cf002963f8d39cd458879767dedc351e3def4b8d3e2a98a4df265da1e60306aa37bcc8e1e45e2e5e1a32017' - '6e3efe9a52c6a1d1b221570c8c9997d5d88e57c8220cda29daa00263ef5578dcdf6d6dbf5721da8d055ec98ad01277458f2cfc9981fc034481b567d3f4c3940d') + '6e3efe9a52c6a1d1b221570c8c9997d5d88e57c8220cda29daa00263ef5578dcdf6d6dbf5721da8d055ec98ad01277458f2cfc9981fc034481b567d3f4c3940d' + '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 rm -r nethogs @@ -27,6 +30,11 @@ 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 + sed -e 's|print_err|print_err_desktop|g' -i src/process/desktop_entry_stat.cpp } build() { Added: deepin-system-monitor-qt5.15.patch =================================================================== --- deepin-system-monitor-qt5.15.patch (rev 0) +++ deepin-system-monitor-qt5.15.patch 2020-05-26 16:54:52 UTC (rev 635139) @@ -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>