diff --git a/.gitignore b/.gitignore index 84b0104..de59ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-43.0.tar.xz /gnome-shell-43.1.tar.xz /gnome-shell-44.beta.tar.xz +/gnome-shell-44.rc.tar.xz diff --git a/0001-endSessionDialog-Don-t-emit-closed-until-handler-is-.patch b/0001-endSessionDialog-Don-t-emit-closed-until-handler-is-.patch deleted file mode 100644 index ff2f11c..0000000 --- a/0001-endSessionDialog-Don-t-emit-closed-until-handler-is-.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 5b1260864b3a1a28d778a8610b4eb13c0bd52c99 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Sun, 5 Mar 2023 20:00:42 -0500 -Subject: [PATCH] endSessionDialog: Don't emit 'closed' until handler is - connected - -Prior to commit 7bd98f3f5fb7e0d1220646b8a4ee7073534a8e8f animation -onComplete handlers always occured at least after one main loop -iteration. - -Now, if animations are disabled, they can get invoked immediately. - -That breaks the endSessionDialog button handler, which calls -close before setting up the "closed" signal handler. - -This commit fixes the handler to get set up first. ---- - js/ui/endSessionDialog.js | 2 +- - subprojects/gvc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index ca24d0698..66fc2e6f9 100644 ---- a/js/ui/endSessionDialog.js -+++ b/js/ui/endSessionDialog.js -@@ -420,65 +420,65 @@ class EndSessionDialog extends ModalDialog.ModalDialog { - return Clutter.EVENT_PROPAGATE; - - let key = event.get_key_symbol(); - if (key !== Clutter.KEY_Alt_L && key !== Clutter.KEY_Alt_R) - return Clutter.EVENT_PROPAGATE; - - if (type === Clutter.EventType.KEY_PRESS) - altEnabled = true; - - this._rebootButton.visible = !altEnabled; - this._rebootButtonAlt.visible = altEnabled; - - return Clutter.EVENT_PROPAGATE; - } - - _updateButtons() { - this.clearButtons(); - - this.addButton({ - action: this.cancel.bind(this), - label: _('Cancel'), - key: Clutter.KEY_Escape, - }); - - let dialogContent = DialogContent[this._type]; - for (let i = 0; i < dialogContent.confirmButtons.length; i++) { - let signal = dialogContent.confirmButtons[i].signal; - let label = dialogContent.confirmButtons[i].label; - let button = this.addButton({ - action: () => { -- this.close(true); - let signalId = this.connect('closed', () => { - this.disconnect(signalId); - this._confirm(signal); - }); -+ this.close(true); - }, - label, - }); - - // Add Alt "Boot Options" option to the Reboot button - if (this._canRebootToBootLoaderMenu && signal === 'ConfirmedReboot') { - this._rebootButton = button; - this._rebootButtonAlt = this.addButton({ - action: () => { - this.close(true); - let signalId = this.connect('closed', () => { - this.disconnect(signalId); - this._confirmRebootToBootLoaderMenu(); - }); - }, - label: C_('button', 'Boot Options'), - }); - this._rebootButtonAlt.visible = false; - this._capturedEventId = this.connect('captured-event', - this._onCapturedEvent.bind(this)); - } - } - } - - _stopAltCapture() { - if (this._capturedEventId > 0) { - global.stage.disconnect(this._capturedEventId); - this._capturedEventId = 0; - } - this._rebootButton = null; diff --git a/gnome-shell.spec b/gnome-shell.spec index 1e5ac2d..43ad29a 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,8 +1,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-shell -Version: 44~beta -Release: 3%{?dist} +Version: 44~rc +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -12,22 +12,19 @@ Source0: https://download.gnome.org/sources/gnome-shell/44/%{name}-%{tarb # Replace Epiphany with Firefox in the default favourite apps list Patch10001: gnome-shell-favourite-apps-firefox.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2174753 -Patch20001: 0001-endSessionDialog-Don-t-emit-closed-until-handler-is-.patch - # Some users might have a broken PAM config, so we really need this # downstream patch to stop trying on configuration errors. Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch %define eds_version 3.45.1 -%define gnome_desktop_version 3.35.91 +%define gnome_desktop_version 40 %define glib2_version 2.56.0 %define gobject_introspection_version 1.49.1 %define gjs_version 1.73.1 %define gtk3_version 3.15.0 %define gtk4_version 4.0.0 %define adwaita_version 1.0.0 -%define mutter_version 44~beta +%define mutter_version 44~rc %define polkit_version 0.100 %define gsettings_desktop_schemas_version 42~beta %define ibus_version 1.5.2 @@ -47,7 +44,7 @@ BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnome-autoar-0) -BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libEGL-devel @@ -94,7 +91,7 @@ Requires: librsvg2%{?_isa} Requires: mutter%{?_isa} >= %{mutter_version} Requires: upower%{?_isa} Requires: polkit%{?_isa} >= %{polkit_version} -Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} +Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version} Requires: glib2%{?_isa} >= %{glib2_version} Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} Requires: gnome-settings-daemon%{?_isa} >= %{gnome_settings_daemon_version} @@ -229,6 +226,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta %{_mandir}/man1/gnome-shell.1* %changelog +* Mon Mar 06 2023 Florian Müllner - 44~rc-1 +- Update to 44.rc + * Sun Mar 05 2023 Ray Strode - 44~beta-3 - Fix slowdown in at shutdown Resolves: #2174753 diff --git a/sources b/sources index 089dfa3..558d957 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-44.beta.tar.xz) = 54add2c478ea35118684b229857c7f8f77bf270f1b465557790375a0b701b1b705025858565f9bcd613af61136e45bc05a659228316f7b51ed288228a576f148 +SHA512 (gnome-shell-44.rc.tar.xz) = b7426564ae5face421f7e61574044851bacc828566629bb4f9efe354e5d3bc3c26e558b20ff07af0e904f1f490d5e734ed66f65c3274152259fa661e1856dcbd