packages/ukui-control-center
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!39 fix arm version root user crash

Browse Source 
From: @dou33
Reviewed-by: @tanyulong2021
Signed-off-by: @tanyulong2021
This commit is contained in:
openeuler-ci-bot 2021-09-02 05:57:13 +00:00 committed by Gitee
commit 60eefda1f7
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix_arm_root_user_crash.patch Normal file
View File

@ -0,0 +1,26 @@
diff -Naur ukui-control-center-3.0.1/plugins/system/display/display.cpp ukui-control-center-3.0.1~/plugins/system/display/display.cpp
--- ukui-control-center-3.0.1/plugins/system/display/display.cpp 2021-09-01 16:38:36.839491260 +0800
+++ ukui-control-center-3.0.1~/plugins/system/display/display.cpp 2021-09-01 16:42:42.542192296 +0800
@@ -29,6 +29,10 @@
#include <QDBusConnection>
DisplaySet::DisplaySet(){
+ mFirstLoad = true;
+ //make sure backend start
+ requestBackend();
+
pluginWidget = new Widget;
pluginName = tr("Display");
QObject::connect(new KScreen::GetConfigOperation(), &KScreen::GetConfigOperation::finished,
@@ -87,8 +91,9 @@
QString output = process.readAll();
output = output.simplified();
- QString command = "/usr/lib/" + output + "-linux-gnu" +"/libexec/kf5/kscreen_backend_launcher";
- QProcess::startDetached(command);
+ //QString command = "/usr/lib/" + output + "-linux-gnu" +"/libexec/kf5/kscreen_backend_launcher";
+ QString command = "/usr/libexec/kf5/kscreen_backend_launcher";
+ QProcess::startDetached(command);
}
}

17
ukui-control-center.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-control-center Name: ukui-control-center
Version: 3.0.1 Version: 3.0.1
Release: 14 Release: 15
Summary: utilities to configure the UKUI desktop Summary: utilities to configure the UKUI desktop
License: GPL-2+ License: GPL-2+
URL: http://www.ukui.org URL: http://www.ukui.org
@ -79,10 +79,11 @@ patch6: 0006-fix-Group-members-are-not-displayed.patch
patch7: 0007-fix-vnc-crashed.patch patch7: 0007-fix-vnc-crashed.patch
patch8: 0008-fix-redeclaration-of-QStringList-usergroupList-in-ed.patch patch8: 0008-fix-redeclaration-of-QStringList-usergroupList-in-ed.patch
patch9: 0009-fix-layout-optimization.patch patch9: 0009-fix-layout-optimization.patch
patch10:0010-Added-translation-using-Weblate-Tibetan.patch patch10: 0010-Added-translation-using-Weblate-Tibetan.patch
patch11:0011-power-add-sleep-function.patch patch11: 0011-power-add-sleep-function.patch
patch12:0012-window-add-title-icon.patch patch12: 0012-window-add-title-icon.patch
patch13:0001-fix-compile-extern-C-error.patch patch13: 0001-fix-compile-extern-C-error.patch
patch14: fix_arm_root_user_crash.patch
Recommends: qt5-qtquickcontrols Recommends: qt5-qtquickcontrols
@ -117,6 +118,7 @@ Suggests: ukui-settings-daemon
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
%build %build
qmake-qt5 qmake-qt5
@ -160,7 +162,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy %{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy
%changelog %changelog
* Tue Jul 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-14 * Wed Sep 1 2021 douyan <douyan@kylinos.cn> - 3.0.1-15
- fix arm verion root user open ukui-control-center crash issue
* Thu Jul 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-14
- solve compile build error - solve compile build error
* Fri Jul 16 2021 tanyulong<tanyulong@kylinos.cn> - 3.0.1-13 * Fri Jul 16 2021 tanyulong<tanyulong@kylinos.cn> - 3.0.1-13