Update to 3.31.2
This commit is contained in:
parent
49db987eaf
commit
9d13ef2dab
1
.gitignore
vendored
1
.gitignore
vendored
@ -150,3 +150,4 @@ gnome-shell-2.31.5.tar.bz2
|
||||
/gnome-shell-3.29.92.tar.xz
|
||||
/gnome-shell-3.30.0.tar.xz
|
||||
/gnome-shell-3.30.1.tar.xz
|
||||
/gnome-shell-3.31.2.tar.xz
|
||||
|
@ -1,68 +0,0 @@
|
||||
From ccc59673827f9e36b7374fcf03de94d1b1513550 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Mon, 22 Oct 2018 22:06:36 +0000
|
||||
Subject: [PATCH] keyboardManager: Avoid idempotent calls to
|
||||
meta_backend_set_keymap()
|
||||
|
||||
But still try to apply the keymap whenever the input sources changed. This
|
||||
is a different approach to gnome-shell#240 that still avoid redundant
|
||||
changes to the current keymap, but actually trigger one when input sources
|
||||
are added.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1637418
|
||||
|
||||
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/691
|
||||
|
||||
|
||||
(cherry picked from commit b405ed64427a9d518d1714df678d04ad11267e15)
|
||||
---
|
||||
js/misc/keyboardManager.js | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
|
||||
index ae59f0014..f4001f130 100644
|
||||
--- a/js/misc/keyboardManager.js
|
||||
+++ b/js/misc/keyboardManager.js
|
||||
@@ -52,11 +52,20 @@ var KeyboardManager = new Lang.Class({
|
||||
this._current = null;
|
||||
this._localeLayoutInfo = this._getLocaleLayout();
|
||||
this._layoutInfos = {};
|
||||
+ this._currentKeymap = null;
|
||||
},
|
||||
|
||||
_applyLayoutGroup(group) {
|
||||
let options = this._buildOptionsString();
|
||||
let [layouts, variants] = this._buildGroupStrings(group);
|
||||
+
|
||||
+ if (this._currentKeymap &&
|
||||
+ this._currentKeymap.layouts == layouts &&
|
||||
+ this._currentKeymap.variants == variants &&
|
||||
+ this._currentKeymap.options == options)
|
||||
+ return;
|
||||
+
|
||||
+ this._currentKeymap = {layouts, variants, options};
|
||||
Meta.get_backend().set_keymap(layouts, variants, options);
|
||||
},
|
||||
|
||||
@@ -89,8 +98,6 @@ var KeyboardManager = new Lang.Class({
|
||||
},
|
||||
|
||||
setUserLayouts(ids) {
|
||||
- let currentId = this._current ? this._current.id : null;
|
||||
- let currentGroupIndex = this._current ? this._current.groupIndex : null;
|
||||
this._current = null;
|
||||
this._layoutInfos = {};
|
||||
|
||||
@@ -117,9 +124,6 @@ var KeyboardManager = new Lang.Class({
|
||||
info.group = group;
|
||||
info.groupIndex = groupIndex;
|
||||
|
||||
- if (currentId == id && currentGroupIndex == groupIndex)
|
||||
- this._current = info;
|
||||
-
|
||||
i += 1;
|
||||
}
|
||||
},
|
||||
--
|
||||
2.19.1
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: gnome-shell
|
||||
Version: 3.30.1
|
||||
Release: 3%{?dist}
|
||||
Version: 3.31.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Window management and application launching for GNOME
|
||||
|
||||
Group: User Interface/Desktops
|
||||
@ -8,7 +8,7 @@ License: GPLv2+
|
||||
Provides: desktop-notification-daemon
|
||||
URL: https://wiki.gnome.org/Projects/GnomeShell
|
||||
#VCS: git:git://git.gnome.org/gnome-shell
|
||||
Source0: http://download.gnome.org/sources/gnome-shell/3.30/%{name}-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/gnome-shell/3.31/%{name}-%{version}.tar.xz
|
||||
|
||||
# Replace Epiphany with Firefox in the default favourite apps list
|
||||
Patch1: gnome-shell-favourite-apps-firefox.patch
|
||||
@ -18,9 +18,6 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
|
||||
Patch2: 0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch
|
||||
Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
|
||||
|
||||
# Backport keyboard layout change fixes (rhbz#1637418)
|
||||
Patch4: 0001-keyboardManager-Avoid-idempotent-calls-to-meta_backe.patch
|
||||
|
||||
%define libcroco_version 0.6.8
|
||||
%define eds_version 3.17.2
|
||||
%define gnome_desktop_version 3.7.90
|
||||
@ -29,7 +26,7 @@ Patch4: 0001-keyboardManager-Avoid-idempotent-calls-to-meta_backe.patch
|
||||
%define gjs_version 1.51.90
|
||||
%define gtk3_version 3.15.0
|
||||
%define json_glib_version 0.13.2
|
||||
%define mutter_version 3.30.1
|
||||
%define mutter_version 3.31.2
|
||||
%define polkit_version 0.100
|
||||
%define gsettings_desktop_schemas_version 3.21.3
|
||||
%define ibus_version 1.5.2
|
||||
@ -217,6 +214,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
|
||||
%{_mandir}/man1/%{name}.1.gz
|
||||
|
||||
%changelog
|
||||
* Wed Nov 14 2018 Florian Müllner <fmuellner@redhat.com> - 3.31.2-1
|
||||
- Update to 3.31.2
|
||||
|
||||
* Mon Nov 12 2018 Mohan Boddu <mboddu@bhujji.com> - 3.30.1-3
|
||||
- Rebuilt for evolution-data-server soname bump
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-shell-3.30.1.tar.xz) = f0c492d364ae49f3f082b6ff98b38fa3f6438e1c7c485bb49c8c0b71ae892228d031c17bb87407ed376ae005dd4538e1883cd8af81b33e224261c23c4b5ae9cf
|
||||
SHA512 (gnome-shell-3.31.2.tar.xz) = 75748acb1f8faba4c367b51fbb8f116117909077419f11ab97a1a8a912459d8cdfecc9718e6c0f4cc5335d6ff553e9f407ceb5858145702d9b5d2bf88ba0173c
|
||||
|
Loading…
Reference in New Issue
Block a user