!9 兼容有xwayland模块下的wayland框架

From: @kylinsecos_admin 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2023-02-07 12:20:13 +00:00 committed by Gitee
commit ffed115903
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 74f5adf42fe766790f38791c939624fcc3c0b6b3 Mon Sep 17 00:00:00 2001
From: kylinsecos_admin <gitee@kylinos.com.cn>
Date: Tue, 7 Feb 2023 15:40:27 +0800
Subject: [PATCH] feature(backends): Compatible wayland framework which exists
xwayland.
Signed-off-by: kylinsecos_admin <gitee@kylinos.com.cn>
---
mate-settings-daemon/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c
index b070361..05b80e1 100644
--- a/mate-settings-daemon/main.c
+++ b/mate-settings-daemon/main.c
@@ -489,6 +489,7 @@ main (int argc, char *argv[])
}
mate_settings_profile_start ("opening gtk display");
+ gdk_set_allowed_backends("x11");
if (! gtk_init_check (NULL, NULL)) {
g_warning ("Unable to initialize GTK+");
exit (EXIT_FAILURE);
--
2.36.1

View File

@ -15,7 +15,7 @@
Name: mate-settings-daemon
Version: %{branch}.0
%if 0%{?rel_build}
Release: 5
Release: 6
%else
Release: 0.9%{?git_rel}
%endif
@ -41,6 +41,7 @@ Patch1002: 0001-feature-touchpad-set-the-default-values-of-disable-w.patch
Patch1003: 0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch
Patch1004: 1004-fix-keybinding-add-some-media-key-translations-f605e267.patch
Patch1005: 1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch
Patch1006: 0001-feature-backends-Compatible-wayland-framework-which-.patch
BuildRequires: dbus-glib-devel
BuildRequires: dconf-devel
@ -138,6 +139,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae
%changelog
* Tue Feb 07 2023 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.0-6
- Compatible wayland framework which exists xwayland.
* Fri Jul 08 2022 longcheng <longcheng@kylinos.com.cn> - 1.22.0-5
- Always use preferred size for Virtual screens or when auto configure monitors Related #24217 #24260
- add the window scale changed tip with notify. (#25310)