Add patch for 3.6.1

0012-feature-style-add-kiran-manual-to-default-white-list.patch

@@ -0,0 +1,30 @@
+From 955fc3cb34017eb8047c866b027083b7522baf1a Mon Sep 17 00:00:00 2001
+From: youzhengcai <youzhengcai@kylinsec.com.cn>
+Date: Fri, 15 Dec 2023 14:25:53 +0800
+Subject: [PATCH] feature(style): add kiran-manual to default white list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 添加 kiran-manual 到默认白名单进程列表
+---
+ common/src/kiran-integration-settings.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/common/src/kiran-integration-settings.h b/common/src/kiran-integration-settings.h
+index 22d7be4..c5bf75f 100644
+--- a/common/src/kiran-integration-settings.h
++++ b/common/src/kiran-integration-settings.h
+@@ -26,6 +26,7 @@ private:
+         "kiran-power-status-icon",
+         "kiran-network-status-icon",
+         "kiran-audio-status-icon",
+-        "kiran-flameshot"
++        "kiran-flameshot",
++        "kiran-manual"
+     };
+ };
+\ No newline at end of file
+-- 
+2.27.0
+

0013-feature-adapt-Modified-some-code-to-adapt-to-KY3.3-6.patch

@@ -0,0 +1,44 @@
+From 0d7c13ac7bd0dd7531def39e706fa38b71598279 Mon Sep 17 00:00:00 2001
+From: yanglan <yanglan@kylinsec.com.cn>
+Date: Wed, 3 Jan 2024 18:08:30 +0800
+Subject: [PATCH] feature(adapt): Modified some code to adapt to KY3.3-6-PG's
+ environment
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+        - 修改代码适配KY3.3-6-PG的环境
+
+Signed-off-by: yanglan <yanglan@kylinsec.com.cn>
+---
+ style-helper/src/font-size-manager-private.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/style-helper/src/font-size-manager-private.h b/style-helper/src/font-size-manager-private.h
+index eccf04b..3c018ba 100644
+--- a/style-helper/src/font-size-manager-private.h
++++ b/style-helper/src/font-size-manager-private.h
+@@ -25,7 +25,13 @@ public:
+ 
+     void init()
+     {
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+         connect(qGuiApp, &QGuiApplication::fontChanged, this, &FontSizeManagerPrivate::handleGuiAppFontChanged);
++#else
++        connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, [this](){
++            this->handleGuiAppFontChanged(qGuiApp->font());
++        });
++#endif
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+         connect(&m_destorySignalMapper, &QSignalMapper::mappedWidget, this, &FontSizeManagerPrivate::handleBindWidgetDestroyed);
+ #else
+@@ -71,4 +77,4 @@ private:
+ 
+     QSignalMapper m_destorySignalMapper;
+ };
+-}  // namespace Kiran
+\ No newline at end of file
++}  // namespace Kiran
+-- 
+2.27.0
+

kiran-qt5-integration.spec

@@ -1,6 +1,6 @@
 Name: 		kiran-qt5-integration
 Version:	2.4.0
-Release:	14
+Release:	16%{?dist}
 Summary:	Kiran desktop platform integration plugin.
 
 License:	MulanPSL-2.0
@@ -17,6 +17,8 @@ Patch0008:	0008-fix-cmake-target-change-cmake-target-name.patch
 Patch0009:	0009-fix-qt5.9.7-fits-the-Qt5.9.7-interface.patch
 Patch0010:	0010-fix-style-add-ks-ssr-gui-to-white-list.patch
 Patch0011:	0011-fix-theme-Fix-the-use-of-QApplication-class-for-plat.patch
+Patch0012:	0012-feature-style-add-kiran-manual-to-default-white-list.patch
+Patch0013:	0013-feature-adapt-Modified-some-code-to-adapt-to-KY3.3-6.patch
 
 BuildRequires:	cmake >= 3.2
 BuildRequires:  gcc-c++
@@ -72,6 +74,12 @@ make %{?_smp_mflags}
 %{_libdir}/pkgconfig/kiran-style-helper.pc
 
 %changelog
+* Mon Apr 15 2024 youzhengcai <youzhengcai@kylinsec.com.cn> - 2.4.0-16
+- rebuild for 3.6.1
+
+* Fri Dec 15 2023 youzhengcai <youzhengcai@kylinsec.com.cn> - 2.4.0-15
+- KYOS-F: add kiran-manual to default kiran-style-apps list
+
 * Mon Dec 04 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-14
 - KYOS-F: Fix the use of QApplication class for platform theme plugin errors