Accepting request 1140749 from home:xiaoguang_wang:branches:GNOME:Factory

- Adapt to version 45.3(bsc#1216072):
  + Rebase gnome-shell-domain.patch
  + Rebase gnome-shell-fate324570-Make-GDM-background-image-configurable.patch

OBS-URL: https://build.opensuse.org/request/show/1140749
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=563
This commit is contained in:
Dominique Leuenberger 2024-01-23 12:19:31 +00:00 committed by Git OBS Bridge
parent 4f944c05aa
commit fc8049531b
3 changed files with 28 additions and 21 deletions

View File

@ -1,7 +1,7 @@
Index: gnome-shell-45.0/js/gdm/domain.js Index: gnome-shell-45.3/js/gdm/domain.js
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gnome-shell-45.0/js/gdm/domain.js +++ gnome-shell-45.3/js/gdm/domain.js
@@ -0,0 +1,236 @@ @@ -0,0 +1,236 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* +/*
@ -239,10 +239,10 @@ Index: gnome-shell-45.0/js/gdm/domain.js
+ return this._activeDomain + this._separator + user; + return this._activeDomain + this._separator + user;
+ } + }
+} +}
Index: gnome-shell-45.0/js/gdm/loginDialog.js Index: gnome-shell-45.3/js/gdm/loginDialog.js
=================================================================== ===================================================================
--- gnome-shell-45.0.orig/js/gdm/loginDialog.js --- gnome-shell-45.3.orig/js/gdm/loginDialog.js
+++ gnome-shell-45.0/js/gdm/loginDialog.js +++ gnome-shell-45.3/js/gdm/loginDialog.js
@@ -29,6 +29,7 @@ import Shell from 'gi://Shell'; @@ -29,6 +29,7 @@ import Shell from 'gi://Shell';
import St from 'gi://St'; import St from 'gi://St';
@ -342,22 +342,22 @@ Index: gnome-shell-45.0/js/gdm/loginDialog.js
this._userList.grab_key_focus(); this._userList.grab_key_focus();
} }
Index: gnome-shell-45.0/js/js-resources.gresource.xml Index: gnome-shell-45.3/js/js-resources.gresource.xml
=================================================================== ===================================================================
--- gnome-shell-45.0.orig/js/js-resources.gresource.xml --- gnome-shell-45.3.orig/js/js-resources.gresource.xml
+++ gnome-shell-45.0/js/js-resources.gresource.xml +++ gnome-shell-45.3/js/js-resources.gresource.xml
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
<gresource prefix="/org/gnome/shell"> <gresource prefix="/org/gnome/shell">
<file>gdm/authList.js</file> <file>gdm/authList.js</file>
<file>gdm/authPrompt.js</file> <file>gdm/authPrompt.js</file>
+ <file>gdm/domain.js</file> + <file>gdm/domain.js</file>
<file>gdm/batch.js</file> <file>gdm/batch.js</file>
<file>gdm/credentialManager.js</file>
<file>gdm/loginDialog.js</file> <file>gdm/loginDialog.js</file>
<file>gdm/oVirt.js</file> Index: gnome-shell-45.3/po/POTFILES.in
Index: gnome-shell-45.0/po/POTFILES.in
=================================================================== ===================================================================
--- gnome-shell-45.0.orig/po/POTFILES.in --- gnome-shell-45.3.orig/po/POTFILES.in
+++ gnome-shell-45.0/po/POTFILES.in +++ gnome-shell-45.3/po/POTFILES.in
@@ -9,6 +9,7 @@ data/org.gnome.Shell.Extensions.desktop. @@ -9,6 +9,7 @@ data/org.gnome.Shell.Extensions.desktop.
data/org.gnome.Shell.PortalHelper.desktop.in.in data/org.gnome.Shell.PortalHelper.desktop.in.in
js/dbusServices/extensions/ui/extension-error-page.ui js/dbusServices/extensions/ui/extension-error-page.ui

View File

@ -1,19 +1,19 @@
Index: gnome-shell-45.0/data/gnome-shell-theme.gresource.xml Index: gnome-shell-45.3/data/gnome-shell-theme.gresource.xml
=================================================================== ===================================================================
--- gnome-shell-45.0.orig/data/gnome-shell-theme.gresource.xml --- gnome-shell-45.3.orig/data/gnome-shell-theme.gresource.xml
+++ gnome-shell-45.0/data/gnome-shell-theme.gresource.xml +++ gnome-shell-45.3/data/gnome-shell-theme.gresource.xml
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
<file>gnome-shell-light.css</file> <file>gnome-shell-light.css</file>
<file>gnome-shell-high-contrast.css</file> <file>gnome-shell-high-contrast.css</file>
<file>gnome-shell-start.svg</file> <file>gnome-shell-start.svg</file>
+ <file>noise-texture.png</file> + <file>noise-texture.png</file>
<file>pad-osd.css</file> <file>pad-osd.css</file>
<file>process-working.svg</file> <file>process-working-light.svg</file>
<file>toggle-off.svg</file> <file>process-working-dark.svg</file>
Index: gnome-shell-45.0/js/ui/screenShield.js Index: gnome-shell-45.3/js/ui/screenShield.js
=================================================================== ===================================================================
--- gnome-shell-45.0.orig/js/ui/screenShield.js --- gnome-shell-45.3.orig/js/ui/screenShield.js
+++ gnome-shell-45.0/js/ui/screenShield.js +++ gnome-shell-45.3/js/ui/screenShield.js
@@ -11,6 +11,7 @@ import St from 'gi://St'; @@ -11,6 +11,7 @@ import St from 'gi://St';
import * as Signals from '../misc/signals.js'; import * as Signals from '../misc/signals.js';
@ -74,7 +74,7 @@ Index: gnome-shell-45.0/js/ui/screenShield.js
} }
async _getLoginSession() { async _getLoginSession() {
@@ -522,6 +547,53 @@ export class ScreenShield extends Signal @@ -518,6 +543,53 @@ export class ScreenShield extends Signal
this.emit('wake-up-screen'); this.emit('wake-up-screen');
} }

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 22 02:31:04 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Adapt to version 45.3(bsc#1216072):
+ Rebase gnome-shell-domain.patch
+ Rebase gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 10 08:56:02 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Wed Jan 10 08:56:02 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>