!14 【轻量级 PR】：修正yaml

From: @licihua 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02

0001-feature-backends-Compatible-wayland-framework-which-.patch

@@ -0,0 +1,45 @@
+From 0a5111bbf17039cf1106d7fc6361305538fbe81a Mon Sep 17 00:00:00 2001
+From: tangjie02 <tangjie02@kylinsec.com.cn>
+Date: Mon, 6 Feb 2023 20:14:18 +0800
+Subject: [PATCH] feature(backends): Compatible wayland framework which exists
+ xwayland.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 让kiran-panel能够在wayland模式下运行。指定kiran-panel的后端为x11，这样kiran-panel会跟xwayland进行交互，确保功能可正常使用
+
+Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
+---
+ libmate-panel-applet/mate-panel-applet.h | 1 +
+ mate-panel/main.c                        | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h
+index d146c93..ee65308 100644
+--- a/libmate-panel-applet/mate-panel-applet.h
++++ b/libmate-panel-applet/mate-panel-applet.h
+@@ -154,6 +154,7 @@ int main(int argc, char* argv[]) \
+ 	int retval; \
+ 	 \
+ 	_MATE_PANEL_APPLET_SETUP_GETTEXT (TRUE); \
++	gdk_set_allowed_backends("x11"); \
+ 	 \
+ 	context = g_option_context_new(""); \
+ 	g_option_context_add_group (context, gtk_get_option_group(TRUE)); \
+diff --git a/mate-panel/main.c b/mate-panel/main.c
+index cf2f1f4..d8174c6 100644
+--- a/mate-panel/main.c
++++ b/mate-panel/main.c
+@@ -81,6 +81,8 @@ main (int argc, char **argv)
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
++	gdk_set_allowed_backends("x11");
++
+ 	/* We will register explicitly when we're ready -- see panel-session.c */
+ 	egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);
+ 
+-- 
+2.36.1
+

0002-fix-Fixed-issue-with-empty-taskbar-due-to-empty-obje.patch

@@ -0,0 +1,82 @@
+From 72c29b2a51c9f22a9832066e710f9d9523b6ff64 Mon Sep 17 00:00:00 2001
+From: youzhengcai <youzhengcai@kylinsec.com.cn>
+Date: Mon, 4 Sep 2023 17:25:15 +0800
+Subject: [PATCH] fix(*): Fixed issue with empty taskbar due to empty object id
+ list.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 修复了由于 object-id-list 为空导致的任务栏为空问题。
+
+Close #14053 #11856
+---
+ mate-panel/panel-profile.c | 31 ++++++++++++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
+index 13a04ab..7e1a039 100644
+--- a/mate-panel/panel-profile.c
++++ b/mate-panel/panel-profile.c
+@@ -86,6 +86,7 @@ static GQuark commit_timeout_quark = 0;
+ 
+ static void panel_profile_object_id_list_update (gchar **objects);
+ static void panel_profile_ensure_toplevel_per_screen (void);
++static GSList* panel_profile_object_id_list(GSettings *panel_settings);
+ 
+ static void
+ panel_profile_set_toplevel_id (PanelToplevel *toplevel,
+@@ -1554,6 +1555,13 @@ panel_profile_object_id_list_notify (GSettings *settings,
+ 	gchar **objects;
+ 	objects = g_settings_get_strv (settings, key);
+ 	panel_profile_object_id_list_update (objects);
++
++    GSList *object_ids = panel_profile_object_id_list(settings);
++    if (g_slist_length(object_ids) == 0){
++        g_settings_set_strv (settings, PANEL_TOPLEVEL_ID_LIST_KEY, NULL);
++    }
++    g_slist_free (object_ids);
++
+ 	g_strfreev (objects);
+ }
+ 
+@@ -1583,6 +1591,19 @@ panel_profile_load_list (GSettings              *settings,
+ 		g_strfreev (list);
+ }
+ 
++static GSList*
++panel_profile_object_id_list(GSettings *panel_settings) {
++    gchar **objects = g_settings_get_strv(panel_settings, PANEL_OBJECT_ID_LIST_KEY);
++
++    GSList *object_ids;
++    object_ids = mate_gsettings_strv_to_gslist ((const gchar **) objects);
++    object_ids = panel_g_slist_make_unique (object_ids,
++                                            (GCompareFunc) g_strcmp0,
++                                            FALSE);
++    g_strfreev(objects);
++    return object_ids;
++}
++
+ static void
+ panel_profile_ensure_toplevel_per_screen ()
+ {
+@@ -1608,7 +1629,15 @@ panel_profile_ensure_toplevel_per_screen ()
+ 	for (l = empty_screens; l; l = l->next)
+ 		panel_layout_apply_default_from_gkeyfile (l->data);
+ 
+-	g_slist_free (empty_screens);
++    GSettings *panel_settings = g_settings_new (PANEL_SCHEMA);
++    GSList *object_ids = panel_profile_object_id_list(panel_settings);
++    if (g_slist_length(object_ids) == 0){
++        g_settings_set_strv (panel_settings, PANEL_TOPLEVEL_ID_LIST_KEY, NULL);
++    }
++    g_slist_free (object_ids);
++    g_object_unref(panel_settings);
++
++    g_slist_free (empty_screens);
+ }
+ 
+ void
+-- 
+2.27.0
+

kiran-panel.spec

@@ -11,13 +11,17 @@
 
 Name:           kiran-panel
 Version:        1.22.4
-Release:        2.kb2
+Release:        6.kb6
 Summary:        KIRAN Desktop panel and applets
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            http://mate-desktop.org
 
 Source0:        %{name}-%{version}.tar.gz
 
+Patch0000:      0001-feature-backends-Compatible-wayland-framework-which-.patch
+Patch0001:      0002-fix-translate-add-some-translation.patch
+Patch0002:      0002-fix-Fixed-issue-with-empty-taskbar-due-to-empty-obje.patch
+
 #kylin
 Obsoletes:       mintmenu
 #endkylin
@@ -129,6 +133,18 @@ desktop-file-install \
 
 
 %changelog
+* Mon Sep 04 2023 youzhengcai <youzhengcai.kylinsec.com.cn> - 1.22.4-6.kb6
+- Fixed issue with empty taskbar due to empty object id list.(#14053 #11856)
+
+* Mon Apr 10 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 1.22.4-3.kb4
+- KYOS-T: add some translation
+
+* Tue Feb 07 2023 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.4-3.kb3
+- Compatible wayland framework which exists xwayland.
+
+* Wed Aug 10 2022 luoqing <luoqing@kylinsec.com.cn> - 1.22.4-3.kb2
+- KYOS-F: Modify license and add yaml file.
+
 * Wed Dec 29 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 1.22.4-2.kb2
 - KYOS-F: Remove the Recommends label
 

kiran-panel.yaml

@@ -0,0 +1,4 @@
+version_control: gitee
+src_repo: openeuler/kiran-panel
+tag_prefix: "^v"
+separator: "."