Update to 3.29.2

.gitignore

@@ -143,3 +143,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-3.28.0.tar.xz
 /gnome-shell-3.28.1.tar.xz
 /gnome-shell-3.29.1.tar.xz
+/gnome-shell-3.29.2.tar.xz

0001-keyboardManager-Preserve-current-keymap-across-reloa.patch

@@ -1,52 +0,0 @@
-From 642107a28f9616b5836d6da3b57d9bfc33acc8d0 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-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
-

0001-networkAgent-Fix-fallout-from-libnm-port.patch

@@ -1,30 +0,0 @@
-From c0a453f64f4c725e520830b2cdba8a608acc94e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Wed, 9 May 2018 16:17:17 +0200
-Subject: [PATCH] networkAgent: Fix fallout from libnm port
-
-While the libnm-glib version of the function returns a GByteArray*
-that gjs can directly cast to the required gutf8*, the libnm function
-returns GBytes* from which we need to explicitly fetch the data.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/issues/136
----
- js/ui/components/networkAgent.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
-index 9050b8a50..5bd648a73 100644
---- a/js/ui/components/networkAgent.js
-+++ b/js/ui/components/networkAgent.js
-@@ -660,7 +660,7 @@ var NetworkAgent = new Lang.Class({
-         switch (connectionType) {
-         case '802-11-wireless':
-             let wirelessSetting = connection.get_setting_wireless();
--            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid());
-+            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
-             title = _("Authentication required by wireless network");
-             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
-             break;
--- 
-2.16.2
-

gnome-shell.spec

@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        3.29.1
-Release:        4%{?dist}
+Version:        3.29.2
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -13,12 +13,6 @@ Source0:        http://download.gnome.org/sources/gnome-shell/3.29/%{name}-%{ver
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch1: gnome-shell-favourite-apps-firefox.patch
 
-# Fix problems when first character in password entry uses a modifier
-# key - GGO#240, RHBZ #1569211, backported from upstream master
-Patch2: 0001-keyboardManager-Preserve-current-keymap-across-reloa.patch
-
-Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch
-
 %define libcroco_version 0.6.8
 %define eds_version 3.17.2
 %define gnome_desktop_version 3.7.90
@@ -27,7 +21,7 @@ Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch
 %define gjs_version 1.51.90
 %define gtk3_version 3.15.0
 %define json_glib_version 0.13.2
-%define mutter_version 3.29.1
+%define mutter_version 3.29.2
 %define polkit_version 0.100
 %define gsettings_desktop_schemas_version 3.21.3
 %define ibus_version 1.5.2
@@ -197,6 +191,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu May 24 2018 Florian Müllner <fmuellner@redhat.com> - 3.29.2-1
+- Update to 3.29.2
+
 * Wed May 09 2018 Florian Müllner <fmuellner@redhat.com> - 3.29.1-3
 - Fix automatic connection to wireless networks without stored secrets
 

sources

@@ -1 +1 @@
-SHA512 (gnome-shell-3.29.1.tar.xz) = b91ffe3b96df1a7264d522b31c8c2e41016ec8a04622273d1884f6653b7c5a2650e1e96feaea567d20d06068f5bff107472ef03df9ac58d9e0284d91d170b0b5
+SHA512 (gnome-shell-3.29.2.tar.xz) = 7877a040c5061b8b7921e6859bad7c4212c53dce6277da0c6ca8b43dd48437e38db7e062ed5b992b76edb96d8e4d3c1edf2efa5521b7589825f2fcbefd0b721a