Accepting request 819375 from GNOME:Next

New stable release, resub with one less patch

OBS-URL: https://build.opensuse.org/request/show/819375
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=439
This commit is contained in:
Dominique Leuenberger 2020-07-10 10:10:02 +00:00 committed by Git OBS Bridge
parent f3d833863f
commit dc8f5edf86
7 changed files with 26 additions and 76 deletions

View File

@ -2,7 +2,7 @@
<service name="obs_scm" mode="disabled" >
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
<param name="scm">git</param>
<param name="revision">refs/tags/3.36.3</param>
<param name="revision">refs/tags/3.36.4</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce92764a144120d90036a66088bd30f2668e8abd3e8219c544a92f1165efce9f
size 13982221

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f023836ebd38e9a4eab6427abb1f3d83cc7e1e59bccb5c6dd148dccd7befb4f
size 14019085

View File

@ -1,65 +0,0 @@
From d2cf13eff4f91e60fbceb7e28573d80eb5b908bb Mon Sep 17 00:00:00 2001
From: Chingkai <chuchingkai@gmail.com>
Date: Sat, 25 Apr 2020 16:29:16 +0800
Subject: [PATCH] unlockDialog: Set Switch User Button via
_updateUserSwitchVisibility
This commit will set the button invisible when the user's can_switch
is false (e.g. when the session is remote) or user-switch-enabled is
disabled.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2687
---
js/ui/unlockDialog.js | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index f74f4be23..cbcc2e512 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -566,9 +566,17 @@ var UnlockDialog = GObject.registerClass({
this._otherUserButton.set_pivot_point(0.5, 0.5);
this._otherUserButton.connect('clicked', this._otherUserClicked.bind(this));
- let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
- screenSaverSettings.bind('user-switch-enabled',
- this._otherUserButton, 'visible', Gio.SettingsBindFlags.GET);
+ this._screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
+
+ this._userSwitchEnabledId = 0;
+ this._userSwitchEnabledId = this._screenSaverSettings.connect('changed::user-switch-enabled',
+ this._updateUserSwitchVisibility.bind(this));
+
+ this._userLoadedId = 0;
+ this._userLoadedId = this._user.connect('notify::is-loaded',
+ this._updateUserSwitchVisibility.bind(this));
+
+ this._updateUserSwitchVisibility();
// Main Box
let mainBox = new St.Widget();
@@ -828,6 +836,21 @@ var UnlockDialog = GObject.registerClass({
this._gdmClient = null;
delete this._gdmClient;
}
+
+ if (this._userLoadedId) {
+ this._user.disconnect(this._userLoadedId);
+ this._userLoadedId = 0;
+ }
+
+ if (this._userSwitchEnabledId) {
+ this._screenSaverSettings.disconnect(this._userSwitchEnabledId);
+ this._userSwitchEnabledId = 0;
+ }
+ }
+
+ _updateUserSwitchVisibility() {
+ this._otherUserButton.visible = this._userManager.can_switch() &&
+ this._screenSaverSettings.get_boolean('user-switch-enabled');
}
cancel() {
--
2.26.2

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Jul 8 07:35:34 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.36.4:
+ Hide switch-user button on lock screen if unsupported.
+ Improve world clocks styling.
+ Improve calendar-server performance.
+ Fix regressions in redesigned modal dialogs.
+ Better support sandboxed apps with multiple .desktop files.
+ Fix on-screen keyboard size in portrait orientation.
+ Support scrolling anywhere in slider menu items.
+ Fixed crash.
+ Plugged leaks.
+ Misc. bug fixes and cleanups.
+ Updated translations.
- Drop patch fixed upstream:
+ gnome-shell-disable-screensaver-user-switch-when-remote.patch
-------------------------------------------------------------------
Thu Jun 11 02:44:58 UTC 2020 - QK ZHU <qkzhu@suse.com>

View File

@ -1,5 +1,5 @@
name: gnome-shell
version: 3.36.3
mtime: 1591141106
commit: b642f9275e5d9f9a4019e4c62d1c74d715b13911
version: 3.36.4
mtime: 1594148718
commit: 7dce43397816c6448ab1f8dcb361c2dc6b8b7104

View File

@ -19,7 +19,7 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell
Version: 3.36.3
Version: 3.36.4
Release: 0
Summary: GNOME Shell
# shew extension is LGPL 2.1; gnome-shell-extension-tool is GPL-3.0-or-later
@ -42,8 +42,6 @@ Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.pa
Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
# PATCH-FIX-UPSTREAM gnome-shell-Get-resource-scale-by-get_resource_scale.patch bsc#1169845 glgo#GNOME/gnome-shell!1206 xwang@suse.com -- Get resource scale by get_resource_scale
Patch6: gnome-shell-Get-resource-scale-by-get_resource_scale.patch
# PATCH-FIX-UPSTREAM gnome-shell-disable-screensaver-user-switch-when-remote.patch bsc#1167276 glgo#GNOME/gnome-shell!1215 qkzhu@suse.com -- Set Switch User Button invisible when session is Remote
Patch7: gnome-shell-disable-screensaver-user-switch-when-remote.patch
## NOTE: Keep SLE-only patches at bottom (starting on 1000).
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
@ -183,7 +181,6 @@ This package contains an optional extensions app for managing GNOME Shell extens
#patch4 -p1
#patch5 -p1
%patch6 -p1
%patch7 -p1
translation-update-upstream