From aa6976f23baa498fbbe45525210a0723586c2240 Mon Sep 17 00:00:00 2001 From: Florian Müllner Date: May 08 2018 20:25:34 +0000 Subject: Update to 3.28.2 --- diff --git a/.gitignore b/.gitignore index c22b4be..10e63f8 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-3.27.92.tar.xz /gnome-shell-3.28.0.tar.xz /gnome-shell-3.28.1.tar.xz +/gnome-shell-3.28.2.tar.xz diff --git a/0001-keyboardManager-Preserve-current-keymap-across-reloa.patch b/0001-keyboardManager-Preserve-current-keymap-across-reloa.patch deleted file mode 100644 index 0ed0a3b..0000000 --- a/0001-keyboardManager-Preserve-current-keymap-across-reloa.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 702338bc7d9e1715a965694508a39c9bb7bbaa22 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Sun, 29 Apr 2018 16:28:04 +0200 -Subject: [PATCH] keyboardManager: Preserve current keymap across reloads - -The IM can pretty much update the input sources anytime (even if -to set the same ones). That ends up triggering rebuilding all user -defined keymaps, and losing modifier state if we are unfortunate -enough that this caught us while pressing one. - -One common situation seems to be password entries, resulting in -the wrong character being printed if the first character happens -to require the shift key. - -If the current keymap is not found in the newly loaded list, -this._current will end up null, with the same behavior as we get -currently (immediate keymap reload). - -https://bugzilla.redhat.com/show_bug.cgi?id=1569211 - -https://gitlab.gnome.org/GNOME/gnome-shell/issues/240 - -Closes: #240 ---- - js/misc/keyboardManager.js | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js -index b8984fe98..3f0bad282 100644 ---- a/js/misc/keyboardManager.js -+++ b/js/misc/keyboardManager.js -@@ -89,6 +89,7 @@ var KeyboardManager = new Lang.Class({ - }, - - setUserLayouts(ids) { -+ let currentId = this._current ? this._current.id : null; - this._current = null; - this._layoutInfos = {}; - -@@ -115,6 +116,9 @@ var KeyboardManager = new Lang.Class({ - info.group = group; - info.groupIndex = groupIndex; - -+ if (id == currentId) -+ this._current = info; -+ - i += 1; - } - }, --- -2.17.0 - diff --git a/0001-polkitAgent-Guard-against-repeated-close-calls.patch b/0001-polkitAgent-Guard-against-repeated-close-calls.patch deleted file mode 100644 index e32d218..0000000 --- a/0001-polkitAgent-Guard-against-repeated-close-calls.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 7c9dbc66d9ab1f3adad29c827fac2d7d3ee05fae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Sat, 21 Apr 2018 18:39:10 +0200 -Subject: [PATCH] polkitAgent: Guard against repeated close() calls - -We use the close() method to disconnect signal handlers set up in -init(), however the handler ID is only valid in the first call in -case the method is called more than once. - -https://gitlab.gnome.org/GNOME/gnome-shell/issues/221 ---- - js/ui/components/polkitAgent.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js -index 316bc2ad1..7a0682c4b 100644 ---- a/js/ui/components/polkitAgent.js -+++ b/js/ui/components/polkitAgent.js -@@ -174,61 +174,63 @@ var AuthenticationDialog = new Lang.Class({ - transition: 'linear' - }); - } else { - Tweener.addTween(this._workSpinner.actor, - { opacity: 0, - time: WORK_SPINNER_ANIMATION_TIME, - transition: 'linear', - onCompleteScope: this, - onComplete() { - if (this._workSpinner) - this._workSpinner.stop(); - } - }); - } - }, - - performAuthentication() { - this.destroySession(); - this._session = new PolkitAgent.Session({ identity: this._identityToAuth, - cookie: this._cookie }); - this._session.connect('completed', this._onSessionCompleted.bind(this)); - this._session.connect('request', this._onSessionRequest.bind(this)); - this._session.connect('show-error', this._onSessionShowError.bind(this)); - this._session.connect('show-info', this._onSessionShowInfo.bind(this)); - this._session.initiate(); - }, - - close(timestamp) { - this.parent(timestamp); - -- Main.sessionMode.disconnect(this._sessionUpdatedId); -+ if (this._sessionUpdatedId) -+ Main.sessionMode.disconnect(this._sessionUpdatedId); -+ this._sessionUpdatedId = 0; - }, - - _ensureOpen() { - // NOTE: ModalDialog.open() is safe to call if the dialog is - // already open - it just returns true without side-effects - if (!this.open(global.get_current_time())) { - // This can fail if e.g. unable to get input grab - // - // In an ideal world this wouldn't happen (because the - // Shell is in complete control of the session) but that's - // just not how things work right now. - // - // One way to make this happen is by running 'sleep 3; - // pkexec bash' and then opening a popup menu. - // - // We could add retrying if this turns out to be a problem - - log('polkitAuthenticationAgent: Failed to show modal dialog.' + - ' Dismissing authentication request for action-id ' + this.actionId + - ' cookie ' + this._cookie); - this._emitDone(true); - } - }, - - _emitDone(dismissed) { - if (!this._doneEmitted) { - this._doneEmitted = true; - this.emit('done', dismissed); - } - }, --- -2.16.2 - diff --git a/gnome-shell.spec b/gnome-shell.spec index e01c830..c22486e 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell -Version: 3.28.1 -Release: 3%{?dist} +Version: 3.28.2 +Release: 1%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -13,11 +13,6 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.28/%{name}-%{ver # Replace Epiphany with Firefox in the default favourite apps list Patch1: gnome-shell-favourite-apps-firefox.patch -Patch10: 0001-polkitAgent-Guard-against-repeated-close-calls.patch -# Fix problems when first character in password entry uses a modifier -# key - GGO#240, RHBZ #1569211, backported from upstream master -Patch11: 0001-keyboardManager-Preserve-current-keymap-across-reloa.patch - %define gnome_bluetooth_version 1:3.9.0 %define gobject_introspection_version 1.45.4 %define gjs_version 1.51.90 @@ -123,9 +118,6 @@ easy to use experience. %setup -q %patch1 -p1 -b .firefox -%patch10 -p1 -b .polkit-fix -%patch11 -p1 -b .preserve-keymap - %build %meson %meson_build @@ -190,6 +182,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %{_mandir}/man1/%{name}.1.gz %changelog +* Tue May 08 2018 Florian Müllner - 3.28.2-1 +- Update to 3.28.2 + * Sun Apr 29 2018 Adam Williamson - 3.28.1-3 - Backport fix for password entry modifier key issues (#1569211) diff --git a/sources b/sources index 66c596a..13b7905 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-3.28.1.tar.xz) = ec8e7dd1d9b4e74cdc84a30546296a5049f13fc64f8b1f46cbba635dd41c0d88e66b297839370690b88dc71acafbb20503f16d4c1970749ff4c2d072537a58c2 +SHA512 (gnome-shell-3.28.2.tar.xz) = d287b81a9355ed55d45dd76dfcc6487fdeb530cd6cba1bec3b436d40b78415241ec25671ce86515de156437293d0648ae513cad801a4ca22f44c6c6db3668332