Update to 3.27.91

This commit is contained in:
Florian Müllner 2018-02-21 23:39:29 +01:00
parent e697520433
commit 758055e020
5 changed files with 15 additions and 106 deletions

1
.gitignore vendored
View File

@ -138,3 +138,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-3.26.0.tar.xz
/gnome-shell-3.26.1.tar.xz
/gnome-shell-3.27.1.tar.xz
/gnome-shell-3.27.91.tar.xz

View File

@ -1,48 +0,0 @@
From b39b84c683e29086b999b835c09ac4ee5a960852 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Thu, 14 Sep 2017 14:46:13 -0400
Subject: [PATCH] gtk-embed: ensure we only listen for window-created events
once
If a tray icon gets a mapped and unmapped and the mapped again
in quick succession, we can end up with multiple handlers
listening for window creation events.
This commit tries to guard against that by only listening for
window-created events when we don't know the actor associated
with the icon.
https://bugzilla.gnome.org/show_bug.cgi?id=787361
---
src/shell-gtk-embed.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
index 176b41320..54061046b 100644
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@@ -124,13 +124,14 @@ shell_gtk_embed_on_window_mapped (GtkWidget *object,
ShellGtkEmbedPrivate *priv = shell_gtk_embed_get_instance_private (embed);
MetaDisplay *display = shell_global_get_display (shell_global_get ());
- /* Listen for new windows so we can detect when Mutter has
- created a MutterWindow for this window */
- priv->window_created_handler =
- g_signal_connect (display,
- "window-created",
- G_CALLBACK (shell_gtk_embed_window_created_cb),
- embed);
+ if (priv->window_created_handler == 0 && priv->window_actor == NULL)
+ /* Listen for new windows so we can detect when Mutter has
+ created a MutterWindow for this window */
+ priv->window_created_handler =
+ g_signal_connect (display,
+ "window-created",
+ G_CALLBACK (shell_gtk_embed_window_created_cb),
+ embed);
}
static void
--
2.13.5

View File

@ -1,44 +0,0 @@
From a46af9edf0b99b64501617a1159bc1beb9af218f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 28 Oct 2017 02:23:02 -0500
Subject: [PATCH] status/keyboard: Reset menuItems and Label objects on change
In the current code it could happen that we've menuItems and indicatorLabels
for sources that aren't anymore around, because in case a source is removed
we don't cleanup the their container objects.
Also, we should nullify InputManager's _currentSource when sources change
or it might point to some invalid data again.
So it could happen that we try to access an invalid menuitem or label
if a source change happens mentioning a source that has been deleted.
https://bugzilla.gnome.org/show_bug.cgi?id=788931
---
js/ui/status/keyboard.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 70e6abf87..b2f10322d 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -529,6 +529,7 @@ var InputSourceManager = new Lang.Class({
let sources = this._settings.inputSources;
let nSources = sources.length;
+ this._currentSource = null;
this._inputSources = {};
this._ibusSources = {};
@@ -827,6 +828,9 @@ var InputSourceIndicator = new Lang.Class({
for (let i in this._indicatorLabels)
this._indicatorLabels[i].destroy();
+ this._menuItems = {};
+ this._indicatorLabels = {};
+
let menuIndex = 0;
for (let i in this._inputSourceManager.inputSources) {
let is = this._inputSourceManager.inputSources[i];
--
2.14.3

View File

@ -1,6 +1,6 @@
Name: gnome-shell
Version: 3.27.1
Release: 5%{?dist}
Version: 3.27.91
Release: 1%{?dist}
Summary: Window management and application launching for GNOME
Group: User Interface/Desktops
@ -13,24 +13,21 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.27/%{name}-%{ver
# Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch
# Backported fix for BGO #788931 / RHBZ #1469129
Patch2: 0001-status-keyboard-Reset-menuItems-and-Label-objects-on.patch
%define gnome_bluetooth_version 1:3.9.0
%define gobject_introspection_version 1.45.4
%define gjs_version 1.47.0
%define mutter_version 3.25.90
%define gjs_version 1.51.90
%define mutter_version 3.27.91
%define gtk3_version 3.15.0
%define eds_version 3.13.90
%define gnome_desktop_version 3.7.90
%define json_glib_version 0.13.2
%define gsettings_desktop_schemas_version 3.21.3
%define caribou_version 0.4.8
%define ibus_version 1.5.2
%define libcroco_version 0.6.8
%define telepathy_logger_version 0.2.6
BuildRequires: meson
BuildRequires: caribou-devel >= %{caribou_version}
BuildRequires: ibus-devel >= %{ibus_version}
BuildRequires: chrpath
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
@ -42,11 +39,12 @@ BuildRequires: gobject-introspection >= %{gobject_introspection_version}
BuildRequires: json-glib-devel >= %{json_glib_version}
BuildRequires: upower-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libnm-gtk-devel
BuildRequires: mesa-libGL-devel
BuildRequires: NetworkManager-glib-devel
BuildRequires: NetworkManager-libnm-devel
BuildRequires: polkit-devel
BuildRequires: startup-notification-devel
# for theme generation
BuildRequires: sassc
# for screencast recorder functionality
BuildRequires: gstreamer1-devel
BuildRequires: gtk3-devel >= %{gtk3_version}
@ -95,7 +93,7 @@ Requires: telepathy-glib%{?_isa}
# needed for schemas
Requires: at-spi2-atk%{?_isa}
# needed for on-screen keyboard
Requires: caribou%{?_isa} >= %{caribou_version}
Requires: ibus%{?_isa} >= %{ibus_version}
# needed for the user menu
Requires: accountsservice-libs%{?_isa}
Requires: gdm-libs%{?_isa}
@ -119,7 +117,6 @@ easy to use experience.
%prep
%setup -q
%patch1 -p1 -b .firefox
%patch2 -p1 -b .788931
%build
%meson
@ -185,6 +182,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
%{_mandir}/man1/%{name}.1.gz
%changelog
* Wed Feb 21 2018 Florian Müllner <fmuellner@redhat.com> - 3.27.91-1
- Update to 3.27.91
* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 3.27.1-5
- Rebuilt for evolution-data-server soname bump

View File

@ -1 +1 @@
SHA512 (gnome-shell-3.27.1.tar.xz) = 19c2642965b2b049f03544102851f741350c7c4ae0c951d57ecc0edb386acd5eef71cf8a8534fc7fb2d23c44653b79a2f83876c73089036849358fcc51561cd1
SHA512 (gnome-shell-3.27.91.tar.xz) = 7dcef05bcc82ee554ec35041a02cb873514554753c3e20cf3a78b47c0a5a54b2b98708a4db34dc0f4df7ab0d35e4b35557030133303e57be2a0d2d911c72ee5a