diff --git a/.gitignore b/.gitignore index 1bbc524..1ac6c8f 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-3.33.2.tar.xz /gnome-shell-3.33.3.tar.xz /gnome-shell-3.33.4.tar.xz +/gnome-shell-3.33.90.tar.xz diff --git a/0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch b/0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch index 612aca1..96fea69 100644 --- a/0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch +++ b/0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch @@ -1,4 +1,4 @@ -From a6da8cb41e5e2a19f790770efb5c241d476ae7b7 Mon Sep 17 00:00:00 2001 +From 5f81215e9771b14be1562d82f54db3fdb92521e3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 15 Aug 2018 14:26:19 +0200 Subject: [PATCH 1/2] endSessionDialog: Immediately add buttons to the dialog @@ -9,14 +9,14 @@ array of button-info structs. This is a preparation patch for adding support changing the "Reboot" button into a "Boot Options" button when Alt is pressed. --- - js/ui/endSessionDialog.js | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + js/ui/endSessionDialog.js | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index ead7eae78..faeefe276 100644 +index 0b475b6f9..301d8c9bf 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js -@@ -439,25 +439,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog { +@@ -440,25 +440,27 @@ class EndSessionDialog extends ModalDialog.ModalDialog { } _updateButtons() { @@ -34,17 +34,23 @@ index ead7eae78..faeefe276 100644 let signal = dialogContent.confirmButtons[i].signal; let label = dialogContent.confirmButtons[i].label; - buttons.push({ action: () => { -+ let button = this.addButton( -+ { action: () => { - this.close(true); - let signalId = this.connect('closed', () => { - this.disconnect(signalId); - this._confirm(signal); - }); +- this.close(true); +- let signalId = this.connect('closed', () => { +- this.disconnect(signalId); +- this._confirm(signal); +- }); - }, - label: label }); -+ }, -+ label: label }); ++ let button = this.addButton({ ++ action: () => { ++ this.close(true); ++ let signalId = this.connect('closed', () => { ++ this.disconnect(signalId); ++ this._confirm(signal); ++ }); ++ }, ++ label ++ }); } - - this.setButtons(buttons); diff --git a/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch b/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch index 6304750..771c16b 100644 --- a/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch +++ b/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch @@ -1,4 +1,4 @@ -From 552fcb1cb7b6d41a54dbd01375bb289934581192 Mon Sep 17 00:00:00 2001 +From 6263d5e115a726dcd75a5368afdd2798236fb1de Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 15 Aug 2018 15:03:56 +0200 Subject: [PATCH 2/2] endSessionDialog: Support rebooting into the bootloader @@ -17,14 +17,14 @@ js/ui/status/system.js first, but that puts the button in a St.Bin() which causes the button to think it is the only button on the dialog and makes it have rounded corners on both of its bottom corners. --- - js/ui/endSessionDialog.js | 50 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 50 insertions(+) + js/ui/endSessionDialog.js | 51 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index faeefe276..43aa3d632 100644 +index 301d8c9bf..0dc717241 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js -@@ -255,6 +255,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog { +@@ -256,6 +256,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog { this._totalSecondsToStayOpen = 0; this._applications = []; this._sessions = []; @@ -34,7 +34,7 @@ index faeefe276..43aa3d632 100644 this.connect('destroy', this._onDestroy.bind(this)); -@@ -438,6 +441,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog { +@@ -439,6 +442,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog { this._sessionHeader.visible = hasSessions; } @@ -61,23 +61,24 @@ index faeefe276..43aa3d632 100644 _updateButtons() { this.clearButtons(); -@@ -458,7 +481,32 @@ class EndSessionDialog extends ModalDialog.ModalDialog { - }); - }, - label: label }); +@@ -460,7 +483,33 @@ class EndSessionDialog extends ModalDialog.ModalDialog { + }, + label + }); + + // Add Alt "Boot Options" option to the Reboot button + if (signal == 'ConfirmedReboot') { + this._rebootButton = button; -+ this._rebootButtonAlt = this.addButton( -+ { action: () => { -+ this.close(true); -+ let signalId = this.connect('closed', () => { -+ this.disconnect(signalId); -+ this._confirm('ConfirmedRebootToBootOptions'); -+ }); -+ }, -+ label: C_("button", "Boot Options") }); ++ this._rebootButtonAlt = this.addButton({ ++ action: () => { ++ this.close(true); ++ let signalId = this.connect('closed', () => { ++ this.disconnect(signalId); ++ this._confirm('ConfirmedRebootToBootOptions'); ++ }); ++ }, ++ label: C_("button", "Boot Options") ++ }); + this._rebootButtonAlt.visible = false; + this._capturedEventId = global.stage.connect('captured-event', this._onCapturedEvent.bind(this)); + } @@ -94,7 +95,7 @@ index faeefe276..43aa3d632 100644 } close(skipSignal) { -@@ -470,6 +518,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog { +@@ -472,6 +521,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog { cancel() { this._stopTimer(); @@ -102,7 +103,7 @@ index faeefe276..43aa3d632 100644 this._dbusImpl.emit_signal('Canceled', null); this.close(); } -@@ -478,6 +527,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog { +@@ -480,6 +530,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog { let callback = () => { this._fadeOutDialog(); this._stopTimer(); diff --git a/gnome-shell.spec b/gnome-shell.spec index 3cad30d..7b53a86 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell -Version: 3.33.4 -Release: 2%{?dist} +Version: 3.33.90 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -22,9 +22,9 @@ Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch %define gnome_desktop_version 3.33.4 %define glib2_version 2.56.0 %define gobject_introspection_version 1.49.1 -%define gjs_version 1.54.0 +%define gjs_version 1.57.3 %define gtk3_version 3.15.0 -%define mutter_version 3.33.4 +%define mutter_version 3.33.90 %define polkit_version 0.100 %define gsettings_desktop_schemas_version 3.33.1 %define ibus_version 1.5.2 @@ -179,8 +179,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml -%{_userunitdir}/gnome-shell.service +%{_userunitdir}/gnome-shell-disable-extensions.service +%{_userunitdir}/gnome-shell-wayland.service %{_userunitdir}/gnome-shell-wayland.target +%{_userunitdir}/ gnome-shell-x11.service %{_userunitdir}/gnome-shell-x11.target %{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop # Co own directory instead of pulling in xdg-desktop-portal - we @@ -201,6 +203,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/%{name}.1.gz %changelog +* Sat Aug 10 2019 Florian Müllner - 3.33.90-1 +- Update to 3.33.90 + * Thu Jul 25 2019 Fedora Release Engineering - 3.33.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a5b98cd..ea4dd4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-3.33.4.tar.xz) = bf7455ec5569b8633cb5ff880dede2dc7d290aca9aa0cf777141b143a2c1de453e336222c7eee11bba3c1ba5d3759361fc424efc9b6e0da59ddf14b11a87ee84 +SHA512 (gnome-shell-3.33.90.tar.xz) = df71e30307f06a64a0a4f872f62eb9b8eea4b052678cbfb478682f7a826453cd8636c63b57c194e2a142557cf18dc0e63c6996a5372e176df5a21e63d0529041