From 7a3dc4aec4516327d1caf758383949ce72825b33 Mon Sep 17 00:00:00 2001
From: dou33 <douyan@kylinos.cn>
Date: Thu, 2 Sep 2021 09:33:15 +0800
Subject: [PATCH] fix arm version root user crash

---
 fix_arm_root_user_crash.patch | 26 ++++++++++++++++++++++++++
 ukui-control-center.spec      | 17 +++++++++++------
 2 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 fix_arm_root_user_crash.patch

diff --git a/fix_arm_root_user_crash.patch b/fix_arm_root_user_crash.patch
new file mode 100644
index 0000000..197152f
--- /dev/null
+++ b/fix_arm_root_user_crash.patch
@@ -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);
+     }
+ }
+ 
diff --git a/ukui-control-center.spec b/ukui-control-center.spec
index bcacb97..b228a84 100644
--- a/ukui-control-center.spec
+++ b/ukui-control-center.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           ukui-control-center
 Version:        3.0.1
-Release:        14
+Release:        15
 Summary:        utilities to configure the UKUI desktop
 License:        GPL-2+
 URL:            http://www.ukui.org
@@ -79,10 +79,11 @@ patch6:	0006-fix-Group-members-are-not-displayed.patch
 patch7: 0007-fix-vnc-crashed.patch
 patch8: 0008-fix-redeclaration-of-QStringList-usergroupList-in-ed.patch
 patch9: 0009-fix-layout-optimization.patch
-patch10:0010-Added-translation-using-Weblate-Tibetan.patch
-patch11:0011-power-add-sleep-function.patch
-patch12:0012-window-add-title-icon.patch
-patch13:0001-fix-compile-extern-C-error.patch
+patch10: 0010-Added-translation-using-Weblate-Tibetan.patch
+patch11: 0011-power-add-sleep-function.patch
+patch12: 0012-window-add-title-icon.patch
+patch13: 0001-fix-compile-extern-C-error.patch
+patch14: fix_arm_root_user_crash.patch
 
 Recommends: qt5-qtquickcontrols
 
@@ -117,6 +118,7 @@ Suggests: ukui-settings-daemon
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 qmake-qt5
@@ -160,7 +162,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy
 
 %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
 
 * Fri Jul 16 2021 tanyulong<tanyulong@kylinos.cn> - 3.0.1-13