diff --git a/0001-feature-backends-Compatible-wayland-framework-which-.patch b/0001-feature-backends-Compatible-wayland-framework-which-.patch new file mode 100644 index 0000000..d3cd56f --- /dev/null +++ b/0001-feature-backends-Compatible-wayland-framework-which-.patch @@ -0,0 +1,31 @@ +From 52df180fc5d96e5b5923667d57be0e971ddc2e9f Mon Sep 17 00:00:00 2001 +From: tangjie02 +Date: Tue, 7 Feb 2023 20:07:29 +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 + +- 在wayland环境下gtk获取的display默认为wayland display,会导致程序崩溃,因此需要强制指定gtk使用x11作为backend。 + +Signed-off-by: tangjie02 +--- + src/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.cpp b/src/main.cpp +index 0ed4cc9..d065d25 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -83,6 +83,7 @@ int main(int argc, char* argv[]) + #if defined KCC_SYSTEM_TYPE + auto loop = Glib::MainLoop::create(); + #elif defined KCC_SESSION_TYPE ++ gdk_set_allowed_backends("x11"); + gtk_init(NULL, NULL); + Gdk::wrap_init(); + Gtk::wrap_init(); +-- +2.36.1 + diff --git a/kiran-cc-daemon.spec b/kiran-cc-daemon.spec index 0e8d8dc..fa1ce54 100644 --- a/kiran-cc-daemon.spec +++ b/kiran-cc-daemon.spec @@ -1,6 +1,6 @@ Name: kiran-cc-daemon Version: 2.4.0 -Release: 7 +Release: 8 Summary: DBus daemon for Kiran Desktop License: MulanPSL-2.0 @@ -12,6 +12,7 @@ Patch0003: 0001-feature-backlight-Support-brightness-modification-by.patch Patch0004: 0001-fix-accounts-Fix-the-polkit-action-for-ChangeAccount.patch Patch0005: 0001-fix-display-Fix-user-add-custom-mode-display.patch Patch0006: 0001-fix-appearance-Fix-plugin-appearance-load-when-caja-.patch +Patch1007: 0001-feature-backends-Compatible-wayland-framework-which-.patch BuildRequires: cmake >= 3.2 @@ -157,6 +158,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || : %{_libdir}/pkgconfig/kiran-cc-daemon.pc %changelog +* Tue Feb 07 2023 tangjie02 - 2.4.0-8 +- Compatible wayland framework which exists xwayland. + * Fri Jan 13 2023 meizhigang - 2.4.0-7 - KYOS-B: Fix plugin appearance load when caja does not exist.