From dcd112d9708954187e7490564c2229d82ba5326f Mon Sep 17 00:00:00 2001 From: Florian Müllner Date: Mar 03 2024 17:38:47 +0000 Subject: Update to 46.rc --- diff --git a/.gitignore b/.gitignore index e8a9a5e..263b49d 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-45.2.tar.xz /gnome-shell-46.alpha.tar.xz /gnome-shell-46.beta.tar.xz +/gnome-shell-46.rc.tar.xz diff --git a/0001-gdm-Work-around-failing-fingerprint-auth.patch b/0001-gdm-Work-around-failing-fingerprint-auth.patch index caac09f..2baa7b6 100644 --- a/0001-gdm-Work-around-failing-fingerprint-auth.patch +++ b/0001-gdm-Work-around-failing-fingerprint-auth.patch @@ -1,4 +1,4 @@ -From 22df9fa5e3c973d5a194f2bbdbcdd4a64511bc93 Mon Sep 17 00:00:00 2001 +From ff73f820b1398e5d60b8984b0003db46ad70b8ec Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 28 Apr 2021 16:50:03 +0200 Subject: [PATCH] gdm: Work around failing fingerprint auth @@ -13,29 +13,29 @@ failure instead. 1 file changed, 18 insertions(+) diff --git a/js/gdm/util.js b/js/gdm/util.js -index b02cd4d73..118a05100 100644 +index 97df6d687e..371953cb25 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js -@@ -157,6 +157,7 @@ var ShellUserVerifier = class { - null, - null, - Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES); +@@ -109,6 +109,7 @@ export class ShellUserVerifier extends Signals.EventEmitter { + this._defaultService = null; + this._preemptingService = null; + this._fingerprintReaderType = FingerprintReaderType.NONE; + this._fprintStartTime = -1; - this._smartcardManager = SmartcardManager.getSmartcardManager(); - // We check for smartcards right away, since an inserted smartcard -@@ -543,6 +544,10 @@ var ShellUserVerifier = class { - async _startService(serviceName) { + this._messageQueue = []; + this._messageQueueTimeoutId = 0; +@@ -669,6 +670,10 @@ export class ShellUserVerifier extends Signals.EventEmitter { this._hold.acquire(); try { -+ if (serviceName == FINGERPRINT_SERVICE_NAME) { + this._activeServices.add(serviceName); ++ ++ if (serviceName == FINGERPRINT_SERVICE_NAME) + this._fprintStartTime = GLib.get_monotonic_time(); -+ } + if (this._userName) { await this._userVerifier.call_begin_verification_for_user( serviceName, this._userName, this._cancellable); -@@ -624,6 +629,7 @@ var ShellUserVerifier = class { +@@ -763,6 +768,7 @@ export class ShellUserVerifier extends Signals.EventEmitter { const cancellable = this._cancellable; this._fingerprintFailedId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FINGERPRINT_ERROR_TIMEOUT_WAIT, () => { @@ -43,7 +43,7 @@ index b02cd4d73..118a05100 100644 this._fingerprintFailedId = 0; if (!cancellable.is_cancelled()) this._verificationFailed(serviceName, false); -@@ -689,6 +695,18 @@ var ShellUserVerifier = class { +@@ -829,6 +835,18 @@ export class ShellUserVerifier extends Signals.EventEmitter { if (serviceName === FINGERPRINT_SERVICE_NAME) { if (this._fingerprintFailedId) GLib.source_remove(this._fingerprintFailedId); @@ -63,5 +63,5 @@ index b02cd4d73..118a05100 100644 // For Not Listed / enterprise logins, immediately reset -- -2.31.1 +2.43.2 diff --git a/gnome-shell.spec b/gnome-shell.spec index 7275ebf..993a9d8 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -2,7 +2,7 @@ %global major_version %%(cut -d "." -f 1 <<<%{tarball_version}) Name: gnome-shell -Version: 46~beta +Version: 46~rc Release: %autorelease Summary: Window management and application launching for GNOME @@ -31,7 +31,7 @@ Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch %define gjs_version 1.73.1 %define gtk4_version 4.0.0 %define adwaita_version 1.0.0 -%define mutter_version 46~beta +%define mutter_version 46~rc %define polkit_version 0.100 %define gsettings_desktop_schemas_version 46~beta %define ibus_version 1.5.2 diff --git a/sources b/sources index 52a94d0..b470a5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-46.beta.tar.xz) = 6e11f738bf7acfde1a86ad9c095fd4759a8eaef68de8b32c482f44d34ecf78ac07c63a6078050fb19e57dd3c50356ada5a85ebbfc4b116844ec204b627c2eecb +SHA512 (gnome-shell-46.rc.tar.xz) = e07180d17e940063151d75e3dd0de1f5b1c17198e15d4d02e6a515a476f3ce561bfab2a1243058831dfe9fa5704c8efe7d0cc6b1f95117f22e0d537349e0d4b9