!5 fix build error
From: @ll3366 Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
commit
8c57ceb00d
@ -1,10 +1,11 @@
|
|||||||
Name: deepin-log-viewer
|
Name: deepin-log-viewer
|
||||||
Version: 5.8.0.23
|
Version: 5.8.0.23
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Log Viewer is a useful tool for viewing system logs.
|
Summary: Log Viewer is a useful tool for viewing system logs.
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/linuxdeepin/deepin-log-viewer
|
URL: https://github.com/linuxdeepin/deepin-log-viewer
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
patch0: modify-QPainterPath-error.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake3
|
||||||
@ -13,12 +14,13 @@ BuildRequires: dtkwidget-devel
|
|||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
BuildRequires: libicu-devel
|
BuildRequires: libicu-devel
|
||||||
BuildRequires: qt5-devel
|
BuildRequires: qt5-devel
|
||||||
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||||
@ -43,6 +45,9 @@ popd
|
|||||||
%{_datadir}/polkit-1/actions/*.policy
|
%{_datadir}/polkit-1/actions/*.policy
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 07 2022 liweigang <liweiganga@uniontech.com> - 5.8.0.23-2
|
||||||
|
- fix build error
|
||||||
|
|
||||||
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.8.0.23-1
|
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.8.0.23-1
|
||||||
- Update 5.8.0.23
|
- Update 5.8.0.23
|
||||||
|
|
||||||
|
|||||||
66
modify-QPainterPath-error.patch
Normal file
66
modify-QPainterPath-error.patch
Normal file
@ -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 <QHBoxLayout>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QResizeEvent>
|
||||||
|
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 <QHBoxLayout>
|
||||||
|
#include <QPaintEvent>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QTreeView>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#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 <QBrush>
|
||||||
|
#include <QPaintEvent>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QPen>
|
||||||
|
|
||||||
|
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 <QFile>
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QHeaderView>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QScrollBar>
|
||||||
|
#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 <QDebug>
|
||||||
|
#include <QPaintEvent>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
|
||||||
|
#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 <QDebug>
|
||||||
|
#include <QModelIndex>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QStyleOptionViewItem>
|
||||||
|
|
||||||
|
#include "logviewitemdelegate.h"
|
||||||
Loading…
x
Reference in New Issue
Block a user