From 45882985ef8029a52365a2adfafaec81856607d5 Mon Sep 17 00:00:00 2001 From: liweiganga Date: Sun, 30 Jan 2022 09:52:22 +0800 Subject: [PATCH] fix build error --- dde-control-center.spec | 10 ++++++++-- modify-QPainterPath-error.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 modify-QPainterPath-error.patch diff --git a/dde-control-center.spec b/dde-control-center.spec index e8f39ea..d8b171d 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,10 +1,11 @@ Name: dde-control-center Version: 5.3.0.54.4 -Release: 1 +Release: 2 Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: modify-QPainterPath-error.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -23,7 +24,8 @@ BuildRequires: kf5-networkmanager-qt-devel BuildRequires: udisks2-qt5-devel BuildRequires: qt5-linguist BuildRequires: cmake -BuildRequires: libXext-devel +BuildRequires: libXext-devel +BuildRequires: qt5-qtbase-private-devel Requires: dde-account-faces Requires: dde-api Requires: dde-daemon @@ -44,6 +46,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version} +%patch0 -p1 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh sed -i -E '/add_compile_definitions/d' CMakeLists.txt @@ -80,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Sun Jan 30 2022 liweigang - 5.3.0.54.4-2 +- fix build error + * Wed Jul 07 2021 weidong - 5.3.0.54.4-1 - Update 5.3.0.54.4 diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch new file mode 100644 index 0000000..6eaaf38 --- /dev/null +++ b/modify-QPainterPath-error.patch @@ -0,0 +1,11 @@ +diff --color -Naur a/src/frame/modules/display/recognizedialog.cpp b/src/frame/modules/display/recognizedialog.cpp +--- a/src/frame/modules/display/recognizedialog.cpp 2022-02-07 09:13:05.486670717 +0800 ++++ b/src/frame/modules/display/recognizedialog.cpp 2022-02-07 09:13:59.994251626 +0800 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + using namespace dcc::display; + -- Gitee