From ccbb31446fd0b681bd5acf7e04f1c0e00e59b0e6 Mon Sep 17 00:00:00 2001 From: Florian Müllner Date: Feb 07 2019 01:57:36 +0000 Subject: Update to 3.31.90 --- diff --git a/.gitignore b/.gitignore index c8a1865..0e57ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-3.30.1.tar.xz /gnome-shell-3.31.2.tar.xz /gnome-shell-3.31.4.tar.xz +/gnome-shell-3.31.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 3d00b40..cff1f20 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 68b038ba1ee10cb957eec56fec435e3cfeffd20d Mon Sep 17 00:00:00 2001 +From ec93430e77cd572cfd313a399128744d9b05e7b9 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 @@ -13,11 +13,11 @@ button into a "Boot Options" button when Alt is pressed. 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index 4804333d4..5657cbffd 100644 +index 1d6efc5ec..d107c87d9 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js -@@ -437,25 +437,26 @@ var EndSessionDialog = new Lang.Class({ - }, +@@ -432,25 +432,26 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { + } _updateButtons() { - let dialogContent = DialogContent[this._type]; @@ -48,9 +48,9 @@ index 4804333d4..5657cbffd 100644 } - - this.setButtons(buttons); - }, + } close(skipSignal) { -- -2.19.0 +2.20.1 diff --git a/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch b/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch index 4634ea9..1a997c7 100644 --- a/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch +++ b/0002-endSessionDialog-Support-rebooting-into-the-bootload.patch @@ -1,4 +1,4 @@ -From 345278af9b7139d12e393d6b18abfe055172dedd Mon Sep 17 00:00:00 2001 +From 7dae43a3ebb8972199da8ce272a3ff5c4ecc5805 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 @@ -12,7 +12,7 @@ to gnome-session instead of the normal ConfirmedReboot signal, actually telling the boot-loader that it should show its menu the next boot is left up to gnome-session. -Note I've tried implementing this with the AltSwitcher class from +Note I've tried implemeting this with the AltSwitcher class from 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. @@ -21,10 +21,10 @@ and makes it have rounded corners on both of its bottom corners. 1 file changed, 50 insertions(+) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index 5657cbffd..bfc64a7d6 100644 +index d107c87d9..a02cd7c23 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js -@@ -271,6 +271,9 @@ var EndSessionDialog = new Lang.Class({ +@@ -266,6 +266,9 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { this._totalSecondsToStayOpen = 0; this._applications = []; this._sessions = []; @@ -34,9 +34,9 @@ index 5657cbffd..bfc64a7d6 100644 this.connect('destroy', this._onDestroy.bind(this)); -@@ -436,6 +439,26 @@ var EndSessionDialog = new Lang.Class({ +@@ -431,6 +434,26 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { this._sessionHeader.visible = hasSessions; - }, + } + _onCapturedEvent(actor, event) { + let altEnabled = false; @@ -56,12 +56,12 @@ index 5657cbffd..bfc64a7d6 100644 + this._rebootButtonAlt.visible = altEnabled; + + return Clutter.EVENT_PROPAGATE; -+ }, ++ } + _updateButtons() { this.clearButtons(); -@@ -456,7 +479,32 @@ var EndSessionDialog = new Lang.Class({ +@@ -451,7 +474,32 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { }); }, label: label }); @@ -82,7 +82,7 @@ index 5657cbffd..bfc64a7d6 100644 + this._capturedEventId = global.stage.connect('captured-event', this._onCapturedEvent.bind(this)); + } + } -+ }, ++ } + + _stopAltCapture() { + if (this._capturedEventId > 0) { @@ -91,18 +91,18 @@ index 5657cbffd..bfc64a7d6 100644 } + this._rebootButton = null; + this._rebootButtonAlt = null; - }, + } close(skipSignal) { -@@ -468,6 +516,7 @@ var EndSessionDialog = new Lang.Class({ +@@ -463,6 +511,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { cancel() { this._stopTimer(); + this._stopAltCapture(); this._dbusImpl.emit_signal('Canceled', null); this.close(); - }, -@@ -476,6 +525,7 @@ var EndSessionDialog = new Lang.Class({ + } +@@ -471,6 +520,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { let callback = () => { this._fadeOutDialog(); this._stopTimer(); @@ -111,5 +111,5 @@ index 5657cbffd..bfc64a7d6 100644 }; -- -2.19.0 +2.20.1 diff --git a/gnome-shell.spec b/gnome-shell.spec index 3eac920..a60a18f 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell -Version: 3.31.4 -Release: 2%{?dist} +Version: 3.31.90 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -205,6 +205,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Feb 07 2019 Florian Müllner - 3.31.90-1 +- Update to 3.31.90 + * Thu Jan 31 2019 Fedora Release Engineering - 3.31.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4e5f5d7..be75980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-3.31.4.tar.xz) = 98972d60912320c1f0d59c0b439ab827bfdffea2deffd9799b735a0e0071c32d9fde9385bbbeadb7e7a3d7ed8756b21b2c27254f3bc439cd339f6115e3897f1d +SHA512 (gnome-shell-3.31.90.tar.xz) = f01a79cd752bb745f34ef1480eabcb19e9cc1ed6c4fb8b745414a0708694a4ee0ddd45202e5634378aa017402813ebd881cbcd333db6b7efc9c048d6e921e012