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

Accepting request 883360 from GNOME:Next

Browse Source 
Rebase SLE patches

OBS-URL: https://build.opensuse.org/request/show/883360
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=472
This commit is contained in:
Dominique Leuenberger 2021-04-12 12:23:54 +00:00 committed by Git OBS Bridge
parent 4390d76cb4
commit fb1932b93e
11 changed files with 128 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
View File

@ -1,15 +0,0 @@
Index: gnome-shell-3.34.5/js/ui/unlockDialog.js
===================================================================
--- gnome-shell-3.34.5.orig/js/ui/unlockDialog.js
+++ gnome-shell-3.34.5/js/ui/unlockDialog.js
@@ -23,6 +23,10 @@ var UnlockDialog = GObject.registerClass
visible: false,
});
+ let path = '/usr/share/gnome-shell/theme/SLE-background.png';
+ if (GLib.file_test(path, GLib.FileTest.EXISTS))
+ this.style = 'background: url(' + path + ')';
+
this.add_constraint(new Layout.MonitorConstraint({ primary: true }));
parentActor.add_child(this);

57
gnome-shell-864872-unlock-by-mouse-motion.patch
View File

@ -1,57 +0,0 @@
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 7b154f2..ff7315d 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -431,6 +431,8 @@ var ScreenShield = class {
this.actor = Main.layoutManager.screenShieldGroup;
this._lockScreenState = MessageTray.State.HIDDEN;
+ this._last_x = -1;
+ this._last_y = -1;
this._lockScreenGroup = new St.Widget({
x_expand: true,
y_expand: true,
@@ -441,6 +443,8 @@ var ScreenShield = class {
});
this._lockScreenGroup.connect('key-press-event',
this._onLockScreenKeyPress.bind(this));
+ this._lockScreenGroup.connect('motion-event',
+ this._onLockScreenMotion.bind(this));
this._lockScreenGroup.connect('scroll-event',
this._onLockScreenScroll.bind(this));
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
@@ -720,6 +724,25 @@ var ScreenShield = class {
return Clutter.EVENT_STOP;
}
+ _onLockScreenMotion(actor, event) {
+ if (this._lockScreenState != MessageTray.State.SHOWN)
+ return false;
+ let [X, Y] = event.get_coords();
+
+ if (this._last_x == -1)
+ this._last_x = X;
+ if (this._last_y == -1)
+ this._last_y = Y;
+
+ let min_distance = 10
+ let distance = Math.max(Math.abs(this._last_x - X),
+ Math.abs(this._last_y - Y));
+
+ if (distance >= min_distance)
+ this._liftShield(true, 0);
+ return true;
+ }
+
_onLockScreenScroll(actor, event) {
if (this._lockScreenState != MessageTray.State.SHOWN)
return Clutter.EVENT_PROPAGATE;
@@ -1036,6 +1059,8 @@ var ScreenShield = class {
return;
this._ensureLockScreen();
+ this._last_x = -1;
+ this._last_y = -1;
this._lockDialogGroup.scale_x = 1;
this._lockDialogGroup.scale_y = 1;

62
gnome-shell-domain.patch
View File

@ -248,39 +248,34 @@ index 0000000..2452696
+});
+Signals.addSignalMethods(DomainMenuButton.prototype);
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index c3f90dc..9546921 100644
index 6f66a27..3f01ca0 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;
@@ -21,6 +21,7 @@ const { AccountsService, Atk, Clutter, Gdm, Gio,
GLib, GObject, Meta, Pango, Shell, St } = imports.gi;
const AuthPrompt = imports.gdm.authPrompt;
+const Domain = imports.gdm.domain;
const Batch = imports.gdm.batch;
const BoxPointer = imports.ui.boxpointer;
const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -437,6 +438,14 @@ var LoginDialog = GObject.registerClass({
@@ -449,6 +450,10 @@ var LoginDialog = GObject.registerClass({
this._authPrompt.hide();
this.add_child(this._authPrompt.actor);
this.add_child(this._authPrompt);
+ this._userLayout = new St.BoxLayout({ vertical: false,
+ x_expand: true
+ });
+ this._userSelectionBox.add(this._userLayout,
+ { expand: true,
+ x_align: St.Align.START,
+ x_fill: true });
+ x_expand: true });
+ this._userSelectionBox.add_child(this._userLayout);
+
// 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({
@@ -470,7 +475,18 @@ var LoginDialog = GObject.registerClass({
this._notListedButton.hide();
- this._userSelectionBox.add(this._notListedButton,
+ this._userLayout.add(this._notListedButton,
+ { expand: false});
- this._userSelectionBox.add_child(this._notListedButton);
+ this._userLayout.add_child(this._notListedButton);
+
+ // we add domain menu button
+ this._domainMenuButton = new Domain.DomainMenuButton();
@ -288,20 +283,14 @@ index c3f90dc..9546921 100644
+ this._domainMenuButton.actor.hide();
+
+ this._domainMenuButton.connect('domain-activated',
+ Lang.bind(this, function(list) {
+ this._hideUserListAskForDomainUsernameAndBeginVerification();
+ }));
+ this._userLayout.add(this._domainMenuButton.actor,
{ expand: false,
- x_align: St.Align.START,
+ x_align: St.Align.END,
x_fill: true });
+ }
+ // domain end
+ Lang.bind(this, function(list) {
+ this._hideUserListAskForDomainUsernameAndBeginVerification(); }));
+ this._userLayout.add_child(this._domainMenuButton.actor);
+ } // domain end
this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
opacity: 0,
@@ -942,6 +965,37 @@ var LoginDialog = GObject.registerClass({
@@ -979,6 +995,37 @@ var LoginDialog = GObject.registerClass({
});
}
@ -339,7 +328,7 @@ index c3f90dc..9546921 100644
_startSession(serviceName) {
this._bindOpacity();
this.ease({
@@ -1099,6 +1153,11 @@ var LoginDialog = GObject.registerClass({
@@ -1134,6 +1181,11 @@ var LoginDialog = GObject.registerClass({
this._askForUsernameAndBeginVerification();
}
@ -351,18 +340,18 @@ index c3f90dc..9546921 100644
_hideUserListAndBeginVerification() {
this._hideUserList();
this._authPrompt.begin();
@@ -1111,6 +1170,9 @@ var LoginDialog = GObject.registerClass({
this._sessionMenuButton.close();
@@ -1147,6 +1199,9 @@ var LoginDialog = GObject.registerClass({
this._sessionMenuButton.hide();
this._setUserListExpanded(true);
this._notListedButton.show();
+ if (this._domainMenuButton.domain_enabled)
+ this._domainMenuButton.actor.show();
+ this._userLayout.show();
this._userList.actor.grab_key_focus();
this._userList.grab_key_focus();
}
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index b5348dd..7d48828 100644
index eebbc36..5e5e7e2 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -2,6 +2,7 @@
@ -371,20 +360,17 @@ index b5348dd..7d48828 100644
<file>gdm/authPrompt.js</file>
+ <file>gdm/domain.js</file>
<file>gdm/batch.js</file>
<file>gdm/fingerprint.js</file>
<file>gdm/loginDialog.js</file>
<file>gdm/oVirt.js</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 33be57b..29bbd3c 100644
index cb279c1..7772367 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in
@@ -6,6 +6,7 @@ data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.PortalHelper.desktop.in.in
js/extensionPrefs/main.js
js/dbusServices/extensions/ui/extension-prefs-dialog.ui
js/gdm/authPrompt.js
+js/gdm/domain.js
js/gdm/loginDialog.js
js/gdm/util.js
js/misc/systemActions.js
--
2.25.1

37
gnome-shell-gdm-login-applet.patch
View File

@ -1,7 +1,8 @@
diff -urpN gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3.33.91/js/js-resources.gresource.xml
--- gnome-shell-3.33.91.orig/js/js-resources.gresource.xml 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/js-resources.gresource.xml 2019-09-04 10:15:21.233934725 -0500
@@ -32,6 +32,7 @@
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index e65e0e9..eebbc36 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -35,6 +35,7 @@
<file>perf/core.js</file>
<file>perf/hwtest.js</file>
@ -9,9 +10,11 @@ diff -urpN gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3.
<file>ui/accessDialog.js</file>
<file>ui/altTab.js</file>
<file>ui/animation.js</file>
diff -urpN gnome-shell-3.33.91.orig/js/ui/aboutMenu.js gnome-shell-3.33.91/js/ui/aboutMenu.js
--- gnome-shell-3.33.91.orig/js/ui/aboutMenu.js 1969-12-31 18:00:00.000000000 -0600
+++ gnome-shell-3.33.91/js/ui/aboutMenu.js 2019-09-04 10:15:40.562037171 -0500
diff --git a/js/ui/aboutMenu.js b/js/ui/aboutMenu.js
new file mode 100644
index 0000000..7add645
--- /dev/null
+++ b/js/ui/aboutMenu.js
@@ -0,0 +1,150 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
@ -163,10 +166,11 @@ diff -urpN gnome-shell-3.33.91.orig/js/ui/aboutMenu.js gnome-shell-3.33.91/js/ui
+
+ return hostname;
+}
diff -urpN gnome-shell-3.33.91.orig/js/ui/panel.js gnome-shell-3.33.91/js/ui/panel.js
--- gnome-shell-3.33.91.orig/js/ui/panel.js 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/ui/panel.js 2019-09-04 10:15:40.562037171 -0500
@@ -769,6 +769,7 @@ class AggregateMenu extends PanelMenu.Bu
diff --git a/js/ui/panel.js b/js/ui/panel.js
index cba3241..f5dfc2b 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -722,6 +722,7 @@ class AggregateMenu extends PanelMenu.Button {
});
const PANEL_ITEM_IMPLEMENTATIONS = {
@ -174,15 +178,16 @@ diff -urpN gnome-shell-3.33.91.orig/js/ui/panel.js gnome-shell-3.33.91/js/ui/pan
'activities': ActivitiesButton,
'aggregateMenu': AggregateMenu,
'appMenu': AppMenuButton,
diff -urpN gnome-shell-3.33.91.orig/js/ui/sessionMode.js gnome-shell-3.33.91/js/ui/sessionMode.js
--- gnome-shell-3.33.91.orig/js/ui/sessionMode.js 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/ui/sessionMode.js 2019-09-04 10:18:12.262841288 -0500
@@ -33,7 +33,7 @@ const _modes = {
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 2136e94..6d5e7c8 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -34,7 +34,7 @@ const _modes = {
unlockDialog: null,
components: [],
panel: {
- left: [],
+ left: ['aboutMenu'],
center: [],
right: []
right: [],
},

20
gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
View File

@ -1,7 +1,7 @@
diff -Nura gnome-shell-3.38.3/js/ui/status/keyboard.js gnome-shell-3.38.3_new/js/ui/status/keyboard.js
--- gnome-shell-3.38.3/js/ui/status/keyboard.js 2021-01-15 01:51:55.673968800 +0800
+++ gnome-shell-3.38.3_new/js/ui/status/keyboard.js 2021-03-17 19:01:52.594128367 +0800
@@ -264,6 +264,33 @@
diff -Nura gnome-shell-40.0/js/ui/status/keyboard.js gnome-shell-40.0_new/js/ui/status/keyboard.js
--- gnome-shell-40.0/js/ui/status/keyboard.js 2021-03-20 20:17:01.436522500 +0800
+++ gnome-shell-40.0_new/js/ui/status/keyboard.js 2021-03-30 20:02:18.835931202 +0800
@@ -264,6 +264,39 @@
this._settings.connect('changed::%s'.format(this._KEY_INPUT_SOURCES), this._emitInputSourcesChanged.bind(this));
this._settings.connect('changed::%s'.format(this._KEY_KEYBOARD_OPTIONS), this._emitKeyboardOptionsChanged.bind(this));
this._settings.connect('changed::%s'.format(this._KEY_PER_WINDOW), this._emitPerWindowChanged.bind(this));
@ -15,22 +15,28 @@ diff -Nura gnome-shell-3.38.3/js/ui/status/keyboard.js gnome-shell-3.38.3_new/js
+ log('Set default input method in Chinese language env.');
+ sourcesList.push(['xkb', 'cn']);
+ sourcesList.push([ "ibus", "libpinyin" ]);
+
+ let params = GLib.Variant.new('a(ss)', sourcesList);
+ this._settings.set_value(this._KEY_INPUT_SOURCES, params);
+ }
+
+ else if (GLib.getenv('LANG') == 'ja_JP.UTF-8') {
+ log('Set default input method in Japanese language env.');
+ sourcesList.push([ "ibus", "mozc-jp" ]);
+ sourcesList.push(['xkb', 'jp']);
+
+ let params = GLib.Variant.new('a(ss)', sourcesList);
+ this._settings.set_value(this._KEY_INPUT_SOURCES, params);
+ }
+
+ else if (GLib.getenv('LANG') == 'ko_KR.UTF-8') {
+ log('Set default input method in Korean language env.');
+ sourcesList.push(['xkb', 'kr']);
+ sourcesList.push([ "ibus", "hangul" ]);
+ }
+
+ let params = GLib.Variant.new('a(ss)', sourcesList);
+ this._settings.set_value(this._KEY_INPUT_SOURCES, params);
+ let params = GLib.Variant.new('a(ss)', sourcesList);
+ this._settings.set_value(this._KEY_INPUT_SOURCES, params);
+ }
+ }
}

10
gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
View File

@ -1,8 +1,8 @@
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 42ae0d3f2..3e5eb94a8 100644
index 1fdbd11..276d98d 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -270,7 +270,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -295,7 +295,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this.contentLayout.add_child(this._applicationSection);
this._sessionSection = new Dialog.ListSection({
@ -11,7 +11,7 @@ index 42ae0d3f2..3e5eb94a8 100644
});
this.contentLayout.add_child(this._sessionSection);
@@ -643,8 +643,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -771,8 +771,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._applications.push(inhibitor);
}
@ -20,5 +20,5 @@ index 42ae0d3f2..3e5eb94a8 100644
+ // if (dialogContent.showOtherSessions) // Hide _sessionList for jsc#SLE-9267
+ // this._loadSessions();
// Only consider updates and upgrades if PackageKit is available.
let updateTriggered = this._pkOfflineProxy ? this._pkOfflineProxy.UpdateTriggered : false;
let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;

34
gnome-shell-lock-bg-on-primary.patch
View File

@ -1,27 +1,27 @@
diff -urp gnome-shell-3.33.91.orig/js/ui/screenShield.js gnome-shell-3.33.91/js/ui/screenShield.js
--- gnome-shell-3.33.91.orig/js/ui/screenShield.js 2019-09-04 14:04:13.523059437 -0500
+++ gnome-shell-3.33.91/js/ui/screenShield.js 2019-09-04 14:20:01.448084179 -0500
@@ -492,7 +492,7 @@ var ScreenShield = class {
y_expand: true,
reactive: true,
pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
- name: 'lockDialogGroup' });
+ name: 'lockDialogGroupReal' });
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 104ff28..72959b3 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -68,7 +68,7 @@ var ScreenShield = class {
reactive: true,
can_focus: true,
pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
- name: 'lockDialogGroup',
+ name: 'lockDialogGroupReal'
});
// Add background for this._lockDialogGroup
this._bgLockDialogGroup = new Clutter.Actor();
@@ -505,6 +505,28 @@ var ScreenShield = class {
Main.layoutManager.connect('monitors-changed', this._updateBgLockDialogGroup.bind(this));
@@ -84,6 +84,27 @@ var ScreenShield = class {
this.actor.add_actor(this._lockScreenGroup);
this.actor.add_actor(this._lockDialogGroup);
+
+ let primaryBackground = new St.Widget({ x_expand: true,
+ y_expand: true,
+ reactive: true,
+ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
+ name: 'lockDialogGroup' });
+ primaryBackground.add_constraint(new Layout.MonitorConstraint({ primary: true }));
++ this.actor.insert_child_below(primaryBackground, null);
+ this.actor.insert_child_below(primaryBackground, null);
+
+ for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
+ if (Main.layoutManager.monitors [i].index == Main.layoutManager.primaryMonitor.index)
@ -36,6 +36,6 @@ diff -urp gnome-shell-3.33.91.orig/js/ui/screenShield.js gnome-shell-3.33.91/js/
+ this.actor.insert_child_below(group, null);
+ }
+
this.actor.add_actor(this._lockScreenGroup);
this._presence = new GnomeSession.Presence((proxy, error) => {
if (error) {
logError(error, 'Error while reading gnome-session presence');

16
gnome-shell-screen-disappear.patch
View File

@ -1,9 +1,9 @@
Index: gnome-shell-3.24.2/js/gdm/authPrompt.js
===================================================================
--- gnome-shell-3.24.2.orig/js/gdm/authPrompt.js
+++ gnome-shell-3.24.2/js/gdm/authPrompt.js
@@ -458,8 +458,10 @@ const AuthPrompt = new Lang.Class({
this.setUser(null);
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index d2c9a16..7a4a0d3 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -500,8 +500,10 @@ var AuthPrompt = GObject.registerClass({
this._updateEntry(true);
this.stopSpinning();
- if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)
@ -11,6 +11,6 @@ Index: gnome-shell-3.24.2/js/gdm/authPrompt.js
+ this._userVerifier.cancel();
this.emit('failed');
+ }
let beginRequestType;
else if (oldStatus === AuthPromptStatus.VERIFICATION_CANCELLED)
this.emit('cancelled');

23
gnome-shell.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Apr 6 06:26:21 UTC 2021 - QK ZHU <qkzhu@suse.com>
- Rebase patches, the following patches are rebased to version
40.0:
+ gnome-shell-domain.patch
+ gnome-shell-gdm-login-applet.patch
+ gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
+ gnome-shell-lock-bg-on-primary.patch
+ gnome-shell-screen-disappear.patch
+ gs-fate318433-prevent-same-account-multi-logins.patch
- Drop 2 patches, lock screen redesigned in version 3.36 or later:
+ gnome-shell-864872-unlock-by-mouse-motion.patch
+ gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
(bsc#1184102).
-------------------------------------------------------------------
Sun Mar 21 17:07:53 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Update
gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch:
fix (boo#1183823).
-------------------------------------------------------------------
Sat Mar 20 16:49:12 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

12
gnome-shell.spec
View File

@ -38,7 +38,7 @@ Patch1: gnome-shell-private-connection.patch
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-fate324570-Make-GDM-background-image-configurable.patch fate#324570, glgo#GNOME/gnome-shell#680, boo#1172826 qkzhu@suse.com -- make GDM background image configurable
Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
# PATCH-NEEDS-REBASE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog (WAS: PATCH-FEATURE-OPENSUSE)
# PATCH-FEATURE-OPENSUSE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog
Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
# PATCH-FIX-UPSTREAM gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch jsc#SLE-16051 glgo#GNOME/gnome-shell!1563 qzhao@suse.com -- launch recommended input engines when Gnome-shell init in CJK regions.
Patch6: gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
@ -52,14 +52,10 @@ Patch1002: gnome-shell-domain.patch
Patch1003: gnome-shell-screen-disappear.patch
# PATCH-FIX-SLE endSession-dialog-update-time-label-every-sec.patch bnc#886132 cxiong@suse.com -- update time label every second in end session dialog
Patch1004: endSession-dialog-update-time-label-every-sec.patch
# PATCH-FEATURE-SLE gnome-shell-864872-unlock-by-mouse-motion.patch bnc#864872 dliang@suse.com -- 10px mouse motion to lift screen shield.
Patch1005: gnome-shell-864872-unlock-by-mouse-motion.patch
# PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 dliang@suse.com -- display background of lock dialog on the primary screen.
Patch1006: gnome-shell-lock-bg-on-primary.patch
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
Patch1007: gs-fate318433-prevent-same-account-multi-logins.patch
# PATCH-FEATURE-SLE gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme.
Patch1008: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
# needed for directory ownership
BuildRequires: asciidoc
@ -182,9 +178,9 @@ This package contains an optional extensions app for managing GNOME Shell extens
%patch1 -p1
%patch2 -p1
%patch4 -p1
#patch5 -p1
%patch5 -p1
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
#patch6 -p1
%patch6 -p1
%endif
translation-update-upstream
@ -194,10 +190,8 @@ translation-update-upstream
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
%patch1008 -p1
%endif
cp %{SOURCE2} data/theme/

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

@ -1,19 +1,17 @@
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 3704645..216ee40 100644
index 7a4a0d3..e5749d6 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -25,7 +25,9 @@ var AuthPromptStatus = {
NOT_VERIFYING: 0,
VERIFYING: 1,
VERIFICATION_FAILED: 2,
- VERIFICATION_SUCCEEDED: 3
+ VERIFICATION_SUCCEEDED: 3,
@@ -31,6 +31,8 @@ var AuthPromptStatus = {
VERIFICATION_SUCCEEDED: 3,
VERIFICATION_CANCELLED: 4,
VERIFICATION_IN_PROGRESS: 5,
+ // NOTE fate#318433 extra state to track multi-login situation
+ VERIFIED_BUT_FORBIDDEN: 4
+ VERIFIED_BUT_FORBIDDEN: 6,
};
var BeginRequestType = {
@@ -244,7 +246,12 @@ var AuthPrompt = class {
@@ -292,7 +294,12 @@ var AuthPrompt = GObject.registerClass({
}
_onVerificationComplete() {
@ -25,21 +23,21 @@ index 3704645..216ee40 100644
+ }
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
this.cancelButton.reactive = false;
}
this.cancelButton.can_focus = false;
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 9546921..1301047 100644
index 3f01ca0..0f5e64c 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -917,6 +917,8 @@ var LoginDialog = GObject.registerClass({
@@ -949,6 +949,8 @@ var LoginDialog = GObject.registerClass({
this._authPrompt.updateSensitivity(false);
let answer = this._authPrompt.getAnswer();
this._user = this._userManager.get_user(answer);
+ this._userLoginForbidden =
+ this._user.is_x_logged_in_remotely();
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: answer });
@@ -984,6 +986,8 @@ var LoginDialog = GObject.registerClass({
this._updateCancelButton();
@@ -1014,6 +1016,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);
@ -48,7 +46,7 @@ index 9546921..1301047 100644
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: domain_answer});
@@ -1010,6 +1014,28 @@ var LoginDialog = GObject.registerClass({
@@ -1040,6 +1044,28 @@ var LoginDialog = GObject.registerClass({
}
_onSessionOpened(client, serviceName) {
@ -77,7 +75,7 @@ index 9546921..1301047 100644
this._authPrompt.finish(() => this._startSession(serviceName));
}
@@ -1189,6 +1215,7 @@ var LoginDialog = GObject.registerClass({
@@ -1217,6 +1243,7 @@ var LoginDialog = GObject.registerClass({
_onUserListActivated(activatedItem) {
this._user = activatedItem.user;
@ -85,6 +83,3 @@ index 9546921..1301047 100644
this._updateCancelButton();
--
2.25.1