!2 fix build error

From: @ll3366 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2022-03-03 08:29:26 +00:00 committed by Gitee
commit 8ee1fe2b4b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 19 additions and 2 deletions

View File

@ -1,10 +1,11 @@
Name: deepin-clone Name: deepin-clone
Version: 5.0.3 Version: 5.0.3
Release: 1 Release: 2
Summary: Disk and partition backup/restore tool Summary: Disk and partition backup/restore tool
License: GPLv3 License: GPLv3
URL: https://github.com/linuxdeepin/deepin-clone URL: https://github.com/linuxdeepin/deepin-clone
Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: modify-QPainterPath-error.patch
BuildRequires: gcc-c++ desktop-file-utils qt5-linguist qt5-qtbase-private-devel BuildRequires: gcc-c++ desktop-file-utils qt5-linguist qt5-qtbase-private-devel
BuildRequires: dtkwidget2-devel dtkcore2-devel deepin-gettext-tools dtkcore2 dtkwidget2 BuildRequires: dtkwidget2-devel dtkcore2-devel deepin-gettext-tools dtkcore2 dtkwidget2
@ -17,11 +18,13 @@ ExclusiveArch: x86_64 %{ix86} aarch64
%{summary}. %{summary}.
%prep %prep
%setup -q %autosetup -p1
sed -i 's|/usr/sbin|/usr/bin|' app/{%{name}-app.pro,%{name}-ionice,%{name}-pkexec,com.deepin.pkexec.%{name}.policy.tmp} sed -i 's|/usr/sbin|/usr/bin|' app/{%{name}-app.pro,%{name}-ionice,%{name}-pkexec,com.deepin.pkexec.%{name}.policy.tmp}
%build %build
export PATH=%{_qt5_bindir}:$PATH export PATH=%{_qt5_bindir}:$PATH
export CFLAGS="%{optflags} -Wno-error=format-security"
export CXXFLAGS="%{optflags} -Wno-error=format-security"
%qmake_qt5 PREFIX=%{_prefix} %qmake_qt5 PREFIX=%{_prefix}
%make_build %make_build
@ -42,5 +45,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
%{_datadir}/polkit-1/actions//com.deepin.pkexec.%{name}.policy %{_datadir}/polkit-1/actions//com.deepin.pkexec.%{name}.policy
%changelog %changelog
* Thu Feb 10 2022 liweigang <liweiganga@uniontech.com> - 5.0.3-2
- fix build error
* Thu Sep 10 2020 chenbo pan <panchenbo@uniontech.com> - 5.0.3-1 * Thu Sep 10 2020 chenbo pan <panchenbo@uniontech.com> - 5.0.3-1
- Initial build - Initial build

View File

@ -0,0 +1,11 @@
diff --color -Naur a/app/src/widgets/iconlabel.cpp b/app/src/widgets/iconlabel.cpp
--- a/app/src/widgets/iconlabel.cpp 2022-02-07 15:19:33.851222835 +0800
+++ b/app/src/widgets/iconlabel.cpp 2022-02-07 15:20:25.279867495 +0800
@@ -24,6 +24,7 @@
#include <QLabel>
#include <QIcon>
#include <QPainter>
+#include <QPainterPath>
IconLabel::IconLabel(QWidget *parent, bool wordWrap)
: QWidget(parent)