From fe88d6e9672d55bd28738b189da94cf6c3d4eedf Mon Sep 17 00:00:00 2001 From: liweiganga Date: Mon, 7 Feb 2022 15:24:14 +0800 Subject: [PATCH] fix build error --- deepin-clone.spec | 10 ++++++++-- modify-QPainterPath-error.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 modify-QPainterPath-error.patch diff --git a/deepin-clone.spec b/deepin-clone.spec index f50e85c..b77fdeb 100644 --- a/deepin-clone.spec +++ b/deepin-clone.spec @@ -1,10 +1,11 @@ Name: deepin-clone Version: 5.0.3 -Release: 1 +Release: 2 Summary: Disk and partition backup/restore tool License: GPLv3 URL: https://github.com/linuxdeepin/deepin-clone 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: dtkwidget2-devel dtkcore2-devel deepin-gettext-tools dtkcore2 dtkwidget2 @@ -17,11 +18,13 @@ ExclusiveArch: x86_64 %{ix86} aarch64 %{summary}. %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} %build export PATH=%{_qt5_bindir}:$PATH +export CFLAGS="%{optflags} -Wno-error=format-security" +export CXXFLAGS="%{optflags} -Wno-error=format-security" %qmake_qt5 PREFIX=%{_prefix} %make_build @@ -42,5 +45,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_datadir}/polkit-1/actions//com.deepin.pkexec.%{name}.policy %changelog +* Thu Feb 10 2022 liweigang - 5.0.3-2 +- fix build error + * Thu Sep 10 2020 chenbo pan - 5.0.3-1 - Initial build diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch new file mode 100644 index 0000000..e4fbb84 --- /dev/null +++ b/modify-QPainterPath-error.patch @@ -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 + #include + #include ++#include + + IconLabel::IconLabel(QWidget *parent, bool wordWrap) + : QWidget(parent)