!17 [sync] PR-16: [update]update version to 5.4.43.27

From: @openeuler-sync-bot 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-07-29 05:21:31 +00:00 committed by Gitee
commit 38b217c717
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 32 additions and 16 deletions

View File

@ -1,11 +1,15 @@
%define specrelease 1%{?dist}
%if 0%{?openeuler}
%define specrelease 1
%endif
Name: dde-control-center Name: dde-control-center
Version: 5.3.0.54.4 Version: 5.4.43.27
Release: 2 Release: %{specrelease}
Summary: New control center for Linux Deepin Summary: New control center for Linux Deepin
License: GPLv3 License: GPLv3
URL: https://github.com/linuxdeepin/%{name} URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: modify-QPainterPath-error.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -26,6 +30,11 @@ BuildRequires: qt5-linguist
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libXext-devel BuildRequires: libXext-devel
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
BuildRequires: gtest-devel
BuildRequires: gmock-devel
BuildRequires: polkit-qt5-1-devel
BuildRequires: deepin-pw-check
BuildRequires: deepin-pw-check-devel
Requires: dde-account-faces Requires: dde-account-faces
Requires: dde-api Requires: dde-api
Requires: dde-daemon Requires: dde-daemon
@ -33,20 +42,21 @@ Requires: dde-qt5integration
Requires: dde-network-utils Requires: dde-network-utils
Requires: startdde Requires: startdde
Requires: dde-server-industry-config Requires: dde-server-industry-config
Requires: deepin-pw-check
Requires: cracklib
Recommends: NetworkManager-l2tp
%description %description
New control center for Linux Deepin. New control center for Linux Deepin.
%package devel %package devel
Summary: %{summary} Summary: %{summary}
BuildArch: noarch
%description devel %description devel
%{summary}. %{summary}.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1
sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
sed -i -E '/add_compile_definitions/d' CMakeLists.txt sed -i -E '/add_compile_definitions/d' CMakeLists.txt
@ -55,9 +65,21 @@ sed -i -E '/add_compile_definitions/d' CMakeLists.txt
-DDISABLE_SYS_UPDATE=YES -DDISABLE_SYS_UPDATE=YES
%make_build %make_build
%post
create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt
%postun
if [ "$1" = "0" ] ; then
create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt
fi
%install %install
%make_install INSTALL_ROOT=%{buildroot} %make_install INSTALL_ROOT=%{buildroot}
# place holder plugins dir
mkdir -p %{buildroot}%{_libdir}/%{name}/plugins mkdir -p %{buildroot}%{_libdir}/%{name}/plugins
# https://github.com/linuxdeepin/dde-control-center/issues/115
# And we disabled SYS_UPDATE, so reboot-reminder-dialog is useless.
#rm %{buildroot}%{_bindir}/reboot-reminder-dialog
mkdir -p %{buildroot}/usr/lib64/cmake/DdeControlCenter mkdir -p %{buildroot}/usr/lib64/cmake/DdeControlCenter
mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter
mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/ mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/
@ -74,6 +96,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
%{_sysconfdir}/ %{_sysconfdir}/
%{_bindir}/abrecovery %{_bindir}/abrecovery
%{_bindir}/dde-control-center %{_bindir}/dde-control-center
%{_bindir}/dde-control-center-wapper
%{_datadir}/ %{_datadir}/
%{_libdir}/libdccwidgets.so %{_libdir}/libdccwidgets.so
/etc/xdg/autostart/deepin-ab-recovery.desktop /etc/xdg/autostart/deepin-ab-recovery.desktop
@ -83,6 +106,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
%{_libdir}/cmake/DdeControlCenter/ %{_libdir}/cmake/DdeControlCenter/
%changelog %changelog
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.4.43.27-1
- Update to 5.4.43.27
* Sun Jan 30 2022 liweigang <liweiganga@uniontech.com> - 5.3.0.54.4-2 * Sun Jan 30 2022 liweigang <liweiganga@uniontech.com> - 5.3.0.54.4-2
- fix build error - fix build error
@ -100,3 +126,4 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
* Fri May 29 2020 uniontech <uoser@uniontech.com> - 5.0.30 * Fri May 29 2020 uniontech <uoser@uniontech.com> - 5.0.30
- Project init. - Project init.

View File

@ -1,11 +0,0 @@
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 <QTimer>
#include <QPainter>
+#include <QPainterPath>
using namespace dcc::display;