From 9bdad23514de66042f0ddbd48725ba8325ae8c25779e0cfe2539e93d7b15da2b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 21 Jul 2021 17:46:57 +0000 Subject: [PATCH] Accepting request 907415 from home:xiaoguang_wang:branches:GNOME:Factory - Drop gnome-shell-lock-bg-on-primary.patch: the gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch has been removed, we don't need this patch now(bsc#1188533). OBS-URL: https://build.opensuse.org/request/show/907415 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=479 --- gnome-shell-lock-bg-on-primary.patch | 41 ---------------------------- gnome-shell.changes | 7 +++++ gnome-shell.spec | 3 -- 3 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 gnome-shell-lock-bg-on-primary.patch diff --git a/gnome-shell-lock-bg-on-primary.patch b/gnome-shell-lock-bg-on-primary.patch deleted file mode 100644 index f19e2da..0000000 --- a/gnome-shell-lock-bg-on-primary.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 -@@ -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); -+ -+ for (let i = 0; i < Main.layoutManager.monitors.length; i++) { -+ if (Main.layoutManager.monitors [i].index == Main.layoutManager.primaryMonitor.index) -+ continue; -+ -+ let group = new St.Widget({ x_expand: true, -+ y_expand: true, -+ reactive: true, -+ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }), -+ name: 'lockDialogGroup' }); -+ group.add_constraint(new Layout.MonitorConstraint({ index: i })); -+ this.actor.insert_child_below(group, null); -+ } -+ - this._presence = new GnomeSession.Presence((proxy, error) => { - if (error) { - logError(error, 'Error while reading gnome-session presence'); diff --git a/gnome-shell.changes b/gnome-shell.changes index da7127b..06be03c 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 21 03:47:44 UTC 2021 - Xiaoguang Wang + +- Drop gnome-shell-lock-bg-on-primary.patch: the + gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch has been + removed, we don't need this patch now(bsc#1188533). + ------------------------------------------------------------------- Tue Jul 13 10:55:55 UTC 2021 - Bjørn Lie diff --git a/gnome-shell.spec b/gnome-shell.spec index 50a1b27..753e8fb 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -52,8 +52,6 @@ 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-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 @@ -190,7 +188,6 @@ translation-update-upstream %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1006 -p1 %patch1007 -p1 %endif