Update to 49.4

Resolves: https://issues.redhat.com/browse/RHEL-144940
This commit is contained in:
Florian Müllner 2026-02-10 20:17:27 +01:00
parent 05d3c59cf2
commit 3b9645a765
No known key found for this signature in database
6 changed files with 204 additions and 310 deletions

1
.gitignore vendored
View File

@ -242,3 +242,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-47.9.tar.xz
/gnome-shell-47.10.tar.xz
/gnome-shell-49.1.tar.xz
/gnome-shell-49.4.tar.xz

File diff suppressed because it is too large Load Diff

View File

@ -1,45 +0,0 @@
From 72073e008f35f197201e6c38ab506fbe5973fbeb Mon Sep 17 00:00:00 2001
From: Joan Torres Lopez <joantolo@redhat.com>
Date: Wed, 28 Jan 2026 18:01:26 +0100
Subject: [PATCH] gdm/util: Set minimum display time for authentication
messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Short messages like "PIN locked" were previously displayed for only
480ms (10 chars × 48ms), making them impossible to read. Ensure all
messages are shown for at least 2 seconds.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4054>
---
js/gdm/util.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 8b999c3..b79b6e7 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -29,7 +29,9 @@ export const LOGO_KEY = 'logo';
export const DISABLE_USER_LIST_KEY = 'disable-user-list';
// Give user 48ms to read each character of a PAM message
+// or 2 seconds, whichever is longer
const USER_READ_TIME = 48;
+const USER_READ_TIME_MIN = 2000;
/**
* Keep messages in order by priority
@@ -232,7 +234,8 @@ export class ShellUserVerifier extends Signals.EventEmitter {
const messageTimeMultiplier = GLib.getenv('GDM_MESSAGE_TIME_MULTIPLIER') ?? 1;
// We probably could be smarter here
- return message.length * USER_READ_TIME * messageTimeMultiplier;
+ return Math.max(message.length * USER_READ_TIME * messageTimeMultiplier,
+ USER_READ_TIME_MIN);
}
_finishMessageQueue() {
--
2.52.0

View File

@ -1,57 +0,0 @@
From a3d658851992b27ad2e0d8f9efeb680b4085d27f Mon Sep 17 00:00:00 2001
From: Sebastian Keller <skeller@gnome.org>
Date: Tue, 28 Oct 2025 23:22:26 +0100
Subject: [PATCH 1/1] Revert "status/keyboard: Track
::layout-layout-group-changed for changes"
This reverts commit e8d73262c73246205e8f7887d99aeb2356cfa89e.
The commit was causing freezes when changing layouts in some situations
and not all of these were adressed by f643915b, such as when switching
from the 3rd to the 4th layout using a xkb shortcut in the X11 session
with 4 layouts.
It was also breaking the order of switching layouts using modifier-only
xkb shortcuts to switch to the next group, which it caused to advance
multiple groups because of the shortcut being handled via both
_modifiersSwitcher() and _layoutGroupChanged().
Further it was possible for _layoutGroupChanged() to trigger an error
due to the locale layout added by _buildGroupStrings() at the end of the
xkb layout list being accessible via the xkb shortcuts. That layout was
not present in _inputSources, leading to "is" being undefined.
Reopens: https://gitlab.gnome.org/GNOME/mutter/-/issues/3926
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8738
Related: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3930
---
js/ui/status/keyboard.js | 7 -------
1 file changed, 7 deletions(-)
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 88e6e93975..2f6773c8c0 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -380,7 +380,6 @@ export class InputSourceManager extends Signals.EventEmitter {
this._ibusManager.connect('set-content-type', this._ibusSetContentType.bind(this));
global.display.connect('modifiers-accelerator-activated', this._modifiersSwitcher.bind(this));
- global.backend.connect('keymap-layout-group-changed', this._layoutGroupChanged.bind(this));
this._sourcesPerWindow = false;
this._focusWindowNotifyId = 0;
@@ -429,12 +428,6 @@ export class InputSourceManager extends Signals.EventEmitter {
return true;
}
- _layoutGroupChanged(backend, idx) {
- const is = this._inputSources[idx];
- this._currentInputSourceChanged(is);
- this._keyboardManager.apply(is.xkbId);
- }
-
_switchInputSource(display, window, event, binding) {
if (this._mruSources.length < 2)
return;
--
GitLab

View File

@ -8,7 +8,7 @@
%endif
Name: gnome-shell
Version: 49.1
Version: 49.4
Release: %autorelease
Summary: Window management and application launching for GNOME
@ -37,15 +37,6 @@ Patch: 0002-Reapply-main-Notify-gnome-session-when-we-re-ready.patch
# downstream patch to stop trying on configuration errors.
Patch: 0001-gdm-Work-around-failing-fingerprint-auth.patch
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3939
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8738#note_2589102
# https://discussion.fedoraproject.org/t/169999
# Reverts some xkb changes that turned out to cause way more problems
# than they solved
# Rediffed on 49.1 - we include only the first revert, as the second
# commit was post-49.1 so there's nothing to revert
Patch: 3939-rediffed.patch
# GDM/Lock stuff
Patch: 0001-screenShield-unblank-when-inserting-smartcard.patch
Patch: enforce-smartcard-at-unlock.patch
@ -54,7 +45,6 @@ Patch: 0001-main-Register-session-with-GDM-on-startup.patch
# Passwordless work
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3212
Patch: 0001-Support-for-web-login-and-unified-auth-mechanism.patch
Patch: 0001-gdm-util-Set-minimum-display-time-for-authentication.patch
# Extensions
Patch: 0001-extensionDownloader-Refuse-to-override-system-extens.patch

View File

@ -1 +1 @@
SHA512 (gnome-shell-49.1.tar.xz) = 0a729c35669780b9b45fbc22497e9ba5e8e6b3c636f87bf54e372f9f261e364bee04352cfdb90f34fb574fe3ee272b3b248d296751521151f43c670f7f1bd381
SHA512 (gnome-shell-49.4.tar.xz) = f101a8f261f6e3ac9f2b08efad71fd6be85f3c7d9070c747e5b9420fa9faa9e86281f76774385807bd9b1ce100fc82b37fa646147e7a4003c7ce3f8cf66b5670