diff --git a/1080.patch b/1080.patch new file mode 100644 index 0000000..4cf376f --- /dev/null +++ b/1080.patch @@ -0,0 +1,26 @@ +From 099b6694b50b9748de6309c99b65bd09e0b6ba6d Mon Sep 17 00:00:00 2001 +From: Alynx Zhou +Date: Mon, 9 Mar 2020 10:09:47 +0800 +Subject: [PATCH] ibusManager: fix ibus launch error because of wrong method + name + +--- + js/misc/ibusManager.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js +index aa1f510602..e27e9f06dd 100644 +--- a/js/misc/ibusManager.js ++++ b/js/misc/ibusManager.js +@@ -66,7 +66,7 @@ var IBusManager = class { + let display = GLib.getenv('GNOME_SETUP_DISPLAY'); + if (display) + launcher.setenv('DISPLAY', display, true); +- launcher.launch(cmdLine); ++ launcher.spawnv(cmdLine); + } catch (e) { + log(`Failed to launch ibus-daemon: ${e.message}`); + } +-- +2.24.1 + diff --git a/gnome-shell.spec b/gnome-shell.spec index 285e603..ac641d0 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.36.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -17,6 +17,11 @@ Patch1: gnome-shell-favourite-apps-firefox.patch Patch2: 0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch +# Fix ibus failing to launch automatically +# https://gitlab.gnome.org/GNOME/gnome-shell/issues/2341 +# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1080 +Patch4: 1080.patch + %define libcroco_version 0.6.8 %define eds_version 3.33.1 %define gnome_desktop_version 3.35.91 @@ -227,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg %changelog +* Tue Mar 10 2020 Adam Williamson - 3.36.0-2 +- Backport fix for ibus failing to start automatically (MR #1080) + * Sat Mar 07 2020 Florian Müllner - 3.36.0-1 - Update to 3.36.0