From 54042e07c51f0d019f3b1ead052279d49328e1d9 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 14:44:25 +0800
Subject: [PATCH] Avoid problem of writing Chinese garbled characters

---
 ...f-writing-Chinese-garbled-characters.patch | 33 +++++++++++++++++++
 ukui-greeter.spec                             |  7 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch

diff --git a/0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch b/0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch
new file mode 100644
index 0000000..1427155
--- /dev/null
+++ b/0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch
@@ -0,0 +1,33 @@
+From a898824a1555208b921fc4b185eea8c2999b15ae Mon Sep 17 00:00:00 2001
+From: tanyulong <tanyulong@kylinos.cn>
+Date: Thu, 28 Oct 2021 14:36:24 +0800
+Subject: [PATCH] Avoid the problem of writing Chinese garbled characters in
+ qsettings
+
+---
+ ukui-greeter/greeter/greeterwrapper.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ukui-greeter/greeter/greeterwrapper.cpp b/ukui-greeter/greeter/greeterwrapper.cpp
+index d155618..e1eb363 100755
+--- a/ukui-greeter/greeter/greeterwrapper.cpp
++++ b/ukui-greeter/greeter/greeterwrapper.cpp
+@@ -21,6 +21,7 @@
+ #include <QDesktopWidget>
+ #include <QDebug>
+ #include <QBitArray>
++#include <QTextCodec>
+ #include "globalv.h"
+ #include "common/configuration.h"
+ 
+@@ -85,6 +86,7 @@ void GreeterWrapper::setrootWindow()
+ 
+      QString configPath = "/tmp/greeter-background.conf";
+      QSettings settings1(configPath, QSettings::IniFormat);
++     settings1.setIniCodec(QTextCodec::codecForName("UTF-8"));
+      settings1.setValue("Greeter",m_rootWindowBackground);
+      settings1.sync();
+ }
+-- 
+2.30.0
+
diff --git a/ukui-greeter.spec b/ukui-greeter.spec
index 327a8d1..185f9d4 100644
--- a/ukui-greeter.spec
+++ b/ukui-greeter.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           ukui-greeter
 Version:        3.0.1
-Release:        3
+Release:        4
 Summary:        Lightdm greeter for UKUI
 License:        GPL-2.0
 URL:            http://www.ukui.org
@@ -22,6 +22,7 @@ Provides: lightdm-greeter
 
 patch0:  0001-fix-icon-misplaced.patch
 patch1:  0002-fix-ukui-greeter-desktop-option-issue.patch
+patch2:	 0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch
 
 %description
 A greeter for UKUI desktop environment written by Qt5.
@@ -31,6 +32,7 @@ A greeter for UKUI desktop environment written by Qt5.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 qmake-qt5
@@ -55,6 +57,9 @@ gzip  -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
 %{_datadir}/xgreeters/ukui-greeter.desktop
 
 %changelog
+* Thu Oct 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-4
+- Avoid problem of writing Chinese garbled characters in qsettings
+
 * Tue Dec 8 2020 lvhan <lvhan@kylinos.cn> - 3.0.1-3
 - 0001-fix-icon-misplaced.patch
 
-- 
Gitee