pool/gnome-shell
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 782822 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/782822
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=174
This commit is contained in:
Dominique Leuenberger 2020-03-11 17:33:27 +00:00 committed by Git OBS Bridge
commit bfe48716dc
9 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
<param name="changesrevision">f21a0ff458f834e0f32cd40f2ecd5a5e4b86c8e1</param></service></servicedata>
<param name="changesrevision">bb9c286e3f9176b6837bd3a9f388e40c06d429b4</param></service></servicedata>

3
gnome-shell-3.34.4+4.obscpio Normal file
View File

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

3
gnome-shell-3.34.4.obscpio
View File

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

27
gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
View File

@ -1,27 +0,0 @@
From 83b01d946517b5995e6423582de13307af91716b Mon Sep 17 00:00:00 2001
From: Xiaoguang Wang <xwang@suse.com>
Date: Tue, 26 Sep 2017 16:54:15 +0800
Subject: [PATCH] gdm: Avoid loginDialog grab focus when locked
https://bugzilla.gnome.org/show_bug.cgi?id=788169
---
js/gdm/loginDialog.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 6c4d135..cfc445b 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -1119,7 +1119,8 @@ var LoginDialog = GObject.registerClass({
this._sessionMenuButton.close();
this._setUserListExpanded(true);
this._notListedButton.show();
- this._userList.actor.grab_key_focus();
+ if (!Main.screenShield.locked)
+ this._userList.actor.grab_key_focus();
}
_beginVerificationForItem(item) {
--
2.16.4

48
gnome-shell-domain.patch
View File

@ -1,7 +1,8 @@
Index: gnome-shell-3.34.1+7/js/gdm/domain.js
===================================================================
diff --git a/js/gdm/domain.js b/js/gdm/domain.js
new file mode 100644
index 0000000..2452696
--- /dev/null
+++ gnome-shell-3.34.1+7/js/gdm/domain.js
+++ b/js/gdm/domain.js
@@ -0,0 +1,243 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
@ -246,11 +247,11 @@ Index: gnome-shell-3.34.1+7/js/gdm/domain.js
+ }
+});
+Signals.addSignalMethods(DomainMenuButton.prototype);
Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js
===================================================================
--- gnome-shell-3.34.1+7.orig/js/gdm/loginDialog.js
+++ gnome-shell-3.34.1+7/js/gdm/loginDialog.js
@@ -22,6 +22,7 @@ const { AccountsService, Atk, Clutter, G
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index c3f90dc..9546921 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -22,6 +22,7 @@ const { AccountsService, Atk, Clutter, Gdm, Gio,
const Signals = imports.signals;
const AuthPrompt = imports.gdm.authPrompt;
@ -258,7 +259,7 @@ Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js
const Batch = imports.gdm.batch;
const BoxPointer = imports.ui.boxpointer;
const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -437,6 +438,14 @@ var LoginDialog = GObject.registerClass(
@@ -437,6 +438,14 @@ var LoginDialog = GObject.registerClass({
this._authPrompt.hide();
this.add_child(this._authPrompt.actor);
@ -273,7 +274,7 @@ Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js
// translators: this message is shown below the user list on the
// login screen. It can be activated to reveal an entry for
// manually entering the username.
@@ -454,10 +463,24 @@ var LoginDialog = GObject.registerClass(
@@ -454,10 +463,24 @@ var LoginDialog = GObject.registerClass({
this._notListedButton.hide();
@ -300,7 +301,7 @@ Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js
this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
opacity: 0,
@@ -942,6 +965,37 @@ var LoginDialog = GObject.registerClass(
@@ -942,6 +965,37 @@ var LoginDialog = GObject.registerClass({
});
}
@ -338,7 +339,7 @@ Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js
_startSession(serviceName) {
this._bindOpacity();
this.ease({
@@ -1099,6 +1153,11 @@ var LoginDialog = GObject.registerClass(
@@ -1099,6 +1153,11 @@ var LoginDialog = GObject.registerClass({
this._askForUsernameAndBeginVerification();
}
@ -350,20 +351,20 @@ Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js
_hideUserListAndBeginVerification() {
this._hideUserList();
this._authPrompt.begin();
@@ -1111,6 +1170,9 @@ var LoginDialog = GObject.registerClass(
@@ -1111,6 +1170,9 @@ var LoginDialog = GObject.registerClass({
this._sessionMenuButton.close();
this._setUserListExpanded(true);
this._notListedButton.show();
+ if (this._domainMenuButton.domain_enabled)
+ this._domainMenuButton.actor.show();
+ this._userLayout.show();
if (!Main.screenShield.locked)
this._userList.actor.grab_key_focus();
}
Index: gnome-shell-3.34.1+7/js/js-resources.gresource.xml
===================================================================
--- gnome-shell-3.34.1+7.orig/js/js-resources.gresource.xml
+++ gnome-shell-3.34.1+7/js/js-resources.gresource.xml
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index b5348dd..7d48828 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -2,6 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/shell">
@ -372,10 +373,10 @@ Index: gnome-shell-3.34.1+7/js/js-resources.gresource.xml
<file>gdm/batch.js</file>
<file>gdm/fingerprint.js</file>
<file>gdm/loginDialog.js</file>
Index: gnome-shell-3.34.1+7/po/POTFILES.in
===================================================================
--- gnome-shell-3.34.1+7.orig/po/POTFILES.in
+++ gnome-shell-3.34.1+7/po/POTFILES.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 33be57b..29bbd3c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.PortalHelper.desktop.in.in
js/extensionPrefs/main.js
@ -384,3 +385,6 @@ Index: gnome-shell-3.34.1+7/po/POTFILES.in
js/gdm/loginDialog.js
js/gdm/util.js
js/misc/systemActions.js
--
2.25.1

20
gnome-shell.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Mar 9 07:56:45 UTC 2020 - QK ZHU <qkzhu@suse.com>
- Drop gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch:
This patch will steal the mouse focus of the gdm greeter, drop
it to be aligned with upstream, let the first/only user entry of
gdm to be selected by default, and the bug the patch fixed can not
be reproduced in GNOME3.34 (bsc#1164856).
- Rebase gs-fate318433-prevent-same-account-multi-logins.patch and
gnome-shell-domain.patch.
-------------------------------------------------------------------
Thu Feb 27 16:52:09 UTC 2020 - dimstar@opensuse.org
- Update to version 3.34.4+4:
* shell: fix typo in comment
* global: force fsync() to worker thread when saving state
* overview: Hide the overview on session mode hasOverview changes
* closeDialog: Make dialog inactive while fading out
-------------------------------------------------------------------
Sun Feb 16 17:08:29 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

6
gnome-shell.obsinfo
View File

@ -1,5 +1,5 @@
name: gnome-shell
version: 3.34.4
mtime: 1581864690
commit: f21a0ff458f834e0f32cd40f2ecd5a5e4b86c8e1
version: 3.34.4+4
mtime: 1582812795
commit: bb9c286e3f9176b6837bd3a9f388e40c06d429b4

5
gnome-shell.spec
View File

@ -19,7 +19,7 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell
Version: 3.34.4
Version: 3.34.4+4
Release: 0
Summary: GNOME Shell
License: GPL-2.0-or-later
@ -35,8 +35,6 @@ Source2: sle-background.png
Patch1: gnome-shell-private-connection.patch
# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
# PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bsc#1058521 bgo#788169 xwang@suse.com -- Avoid login dialog grabs focus when screen locked
Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-fate324570-Make-GDM-background-image-configurable.patch fate#324570, glgo#GNOME/gnome-shell#680 qkzhu@suse.com -- make GDM background image configurable
Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog
@ -169,7 +167,6 @@ into GNOME Shell calendar.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1

25
gs-fate318433-prevent-same-account-multi-logins.patch
View File

@ -1,6 +1,7 @@
diff -urp gnome-shell-3.33.91.orig/js/gdm/authPrompt.js gnome-shell-3.33.91/js/gdm/authPrompt.js
--- gnome-shell-3.33.91.orig/js/gdm/authPrompt.js 2019-09-04 13:36:37.170279229 -0500
+++ gnome-shell-3.33.91/js/gdm/authPrompt.js 2019-09-04 15:11:35.568485953 -0500
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 3704645..216ee40 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -25,7 +25,9 @@ var AuthPromptStatus = {
NOT_VERIFYING: 0,
VERIFYING: 1,
@ -25,10 +26,11 @@ diff -urp gnome-shell-3.33.91.orig/js/gdm/authPrompt.js gnome-shell-3.33.91/js/g
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
this.cancelButton.reactive = false;
}
diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/gdm/loginDialog.js
--- gnome-shell-3.33.91.orig/js/gdm/loginDialog.js 2019-09-04 12:52:15.396169384 -0500
+++ gnome-shell-3.33.91/js/gdm/loginDialog.js 2019-09-04 14:47:26.796805978 -0500
@@ -917,6 +917,8 @@ var LoginDialog = GObject.registerClass(
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 9546921..1301047 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -917,6 +917,8 @@ var LoginDialog = GObject.registerClass({
this._authPrompt.updateSensitivity(false);
let answer = this._authPrompt.getAnswer();
this._user = this._userManager.get_user(answer);
@ -37,7 +39,7 @@ diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: answer });
@@ -984,6 +986,8 @@ var LoginDialog = GObject.registerClass(
@@ -984,6 +986,8 @@ var LoginDialog = GObject.registerClass({
let answer = this._authPrompt.getAnswer();
let domain_answer = this._domainMenuButton.getDomainUser(answer);
this._user = this._userManager.get_user(domain_answer);
@ -46,7 +48,7 @@ diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: domain_answer});
@@ -1010,6 +1014,28 @@ var LoginDialog = GObject.registerClass(
@@ -1010,6 +1014,28 @@ var LoginDialog = GObject.registerClass({
}
_onSessionOpened(client, serviceName) {
@ -75,7 +77,7 @@ diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/
this._authPrompt.finish(() => this._startSession(serviceName));
}
@@ -1190,6 +1216,7 @@ var LoginDialog = GObject.registerClass(
@@ -1189,6 +1215,7 @@ var LoginDialog = GObject.registerClass({
_onUserListActivated(activatedItem) {
this._user = activatedItem.user;
@ -83,3 +85,6 @@ diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/
this._updateCancelButton();
--
2.25.1