From 9dab8c9188985c157c1370f1454fe8b65f0c1340 Mon Sep 17 00:00:00 2001 From: liweiganga Date: Mon, 7 Feb 2022 16:39:19 +0800 Subject: [PATCH] fix build error --- deepin-log-viewer.spec | 9 ++++- modify-QPainterPath-error.patch | 66 +++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 modify-QPainterPath-error.patch diff --git a/deepin-log-viewer.spec b/deepin-log-viewer.spec index ee4af94..f12ba4c 100644 --- a/deepin-log-viewer.spec +++ b/deepin-log-viewer.spec @@ -1,10 +1,11 @@ Name: deepin-log-viewer Version: 5.8.0.23 -Release: 1 +Release: 2 Summary: Log Viewer is a useful tool for viewing system logs. License: GPLv3+ URL: https://github.com/linuxdeepin/deepin-log-viewer Source0: %{name}-%{version}.tar.gz +patch0: modify-QPainterPath-error.patch BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -13,12 +14,13 @@ BuildRequires: dtkwidget-devel BuildRequires: systemd-devel BuildRequires: libicu-devel BuildRequires: qt5-devel +BuildRequires: qt5-qtbase-private-devel %description %{summary}. %prep -%autosetup +%autosetup -p1 %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -43,6 +45,9 @@ popd %{_datadir}/polkit-1/actions/*.policy %changelog +* Mon Feb 07 2022 liweigang - 5.8.0.23-2 +- fix build error + * Mon Jul 12 2021 weidong - 5.8.0.23-1 - Update 5.8.0.23 diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch new file mode 100644 index 0000000..720410d --- /dev/null +++ b/modify-QPainterPath-error.patch @@ -0,0 +1,66 @@ +diff --color -Naur a/application/filtercontent.cpp b/application/filtercontent.cpp +--- a/application/filtercontent.cpp 2022-02-07 16:19:13.701730243 +0800 ++++ b/application/filtercontent.cpp 2022-02-07 16:21:44.331905565 +0800 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --color -Naur a/application/logdetailinfowidget.cpp b/application/logdetailinfowidget.cpp +--- a/application/logdetailinfowidget.cpp 2022-02-07 16:19:13.701730243 +0800 ++++ b/application/logdetailinfowidget.cpp 2022-02-07 16:20:52.611208915 +0800 +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include "structdef.h" +diff --color -Naur a/application/logperiodbutton.cpp b/application/logperiodbutton.cpp +--- a/application/logperiodbutton.cpp 2022-02-07 16:19:13.701730243 +0800 ++++ b/application/logperiodbutton.cpp 2022-02-07 16:19:56.846400575 +0800 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + DWIDGET_USE_NAMESPACE +diff --color -Naur a/application/logtreeview.cpp b/application/logtreeview.cpp +--- a/application/logtreeview.cpp 2022-02-07 16:19:13.701730243 +0800 ++++ b/application/logtreeview.cpp 2022-02-07 16:22:34.720539978 +0800 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include "structdef.h" + +diff --color -Naur a/application/logviewheaderview.cpp b/application/logviewheaderview.cpp +--- a/application/logviewheaderview.cpp 2022-02-07 16:19:13.701730243 +0800 ++++ b/application/logviewheaderview.cpp 2022-02-07 16:21:23.147626057 +0800 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "logviewheaderview.h" + +diff --color -Naur a/application/logviewitemdelegate.cpp b/application/logviewitemdelegate.cpp +--- a/application/logviewitemdelegate.cpp 2022-02-07 16:19:13.701730243 +0800 ++++ b/application/logviewitemdelegate.cpp 2022-02-07 16:20:25.098817915 +0800 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + #include "logviewitemdelegate.h" -- Gitee