Accepting request 907053 from GNOME:Factory

GNOME 40.3 (forwarded request 906597 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/907053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=201
This commit is contained in:
Dominique Leuenberger 2021-07-21 17:06:03 +00:00 committed by Git OBS Bridge
commit 16d6096a7c
5 changed files with 18 additions and 67 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
size 1869600

3
gnome-shell-40.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
size 1869724

View File

@ -1,60 +0,0 @@
From b88d757d4bbee8b20bdd2fb2bda8ea13f51f3837 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 15 Jun 2021 08:50:56 +0200
Subject: [PATCH] windowManager: Remove timeout on starting X11 services
With Xwayland started on demand, mutter/gnome-shell will spawn Xwayland
and GNOME settings daemon Xsettings.
Currently, gnome-shell uses a timeout of 5 seconds before canceling the
launch and declare failure to start X11 services.
While 5 seconds may seem like a lot of time, when this is executed on a
virtual machine part of a QA tests under load, this causes random
failures.
There is no good value here, we could increase the timeout but it will
always remain racy. Instead, remove the timeout, systemd itself already
has a timeout mechanism (with a much longer wait time).
---
js/ui/windowManager.js | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index bacb6dddb5..d01bac19c7 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -907,14 +907,7 @@ var WindowManager = class {
global.display.connect('init-xserver', (display, task) => {
IBusManager.getIBusManager().restartDaemon(['--xim']);
- /* Timeout waiting for start job completion after 5 seconds */
- let cancellable = new Gio.Cancellable();
- GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
- cancellable.cancel();
- return GLib.SOURCE_REMOVE;
- });
-
- this._startX11Services(task, cancellable);
+ this._startX11Services(task);
return true;
});
@@ -972,11 +965,11 @@ var WindowManager = class {
});
}
- async _startX11Services(task, cancellable) {
+ async _startX11Services(task) {
let status = true;
try {
await Shell.util_start_systemd_unit(
- 'gnome-session-x11-services-ready.target', 'fail', cancellable);
+ 'gnome-session-x11-services-ready.target', 'fail', null);
} catch (e) {
// Ignore NOT_SUPPORTED error, which indicates we are not systemd
// managed and gnome-session will have taken care of everything
--
GitLab

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Jul 13 10:55:55 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 40.3:
+ Fix glitch in app grid → session transition.
+ Fix IM popup visibility when in fullscreen.
+ magnifier: Fix view jumps when using caret tracking.
+ Fix shadow rendering glitches.
+ Fix vertical scrollbars in RTL locales.
+ Fixed crash.
+ Misc. bug fixes and cleanups.
+ Updated translations.
- Drop gnome-shell-session-launch-timeout.patch: Fixed upstream.
-------------------------------------------------------------------
Tue Jun 15 09:11:22 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -19,7 +19,7 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell
Version: 40.2
Version: 40.3
Release: 0
Summary: GNOME Shell
# shew extension is LGPL 2.1; gnome-shell-extension-tool is GPL-3.0-or-later
@ -42,8 +42,6 @@ Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.pa
Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
# PATCH-FIX-UPSTREAM gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch jsc#SLE-16051 glgo#GNOME/gnome-shell!1563 qzhao@suse.com -- launch recommended input engines when Gnome-shell init in CJK regions.
Patch6: gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
# PATCH-FIX-UPSTREAM gnome-shell-session-launch-timeout.patch dimstar@opensuse.org -- Give the X11 setup more time to launch, needed for the live ISOs
Patch7: gnome-shell-session-launch-timeout.patch
## NOTE: Keep SLE-only patches at bottom (starting on 1000).
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
@ -184,7 +182,6 @@ This package contains an optional extensions app for managing GNOME Shell extens
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
%patch6 -p1
%endif
%patch7 -p1
translation-update-upstream