Accepting request 1192805 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1192805 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=259
2024-08-10 17:06:08 +00:00
parent 62cfe51f49 0561dc4828
commit bec72b6c0f
6 changed files with 89 additions and 89 deletions
--- a/gnome-shell-domain.patch
+++ b/gnome-shell-domain.patch
@@ -1,7 +1,6 @@
-Index: gnome-shell-45.3/js/gdm/domain.js
-===================================================================
--- /dev/null
-+++ gnome-shell-45.3/js/gdm/domain.js
+diff -urpN gnome-shell-46.4.orig/js/gdm/domain.js gnome-shell-46.4/js/gdm/domain.js
+--- gnome-shell-46.4.orig/js/gdm/domain.js	1969-12-31 18:00:00.000000000 -0600
+++ gnome-shell-46.4/js/gdm/domain.js	2024-08-08 13:55:04.969310721 -0500
@@ -0,0 +1,236 @@
 +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 +/*
@@ -76,7 +75,7 @@ Index: gnome-shell-45.3/js/gdm/domain.js
 +        this.actor = new St.Bin({ child: this._button });
 +
 +        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.TOP);
-+        Main.uiGroup.add_actor(this._menu.actor);
+        Main.uiGroup.add_child(this._menu.actor);
 +        this._menu.actor.hide();
 +
 +        this._menu.connect('open-state-changed',
@@ -239,10 +238,9 @@ Index: gnome-shell-45.3/js/gdm/domain.js
 +        return this._activeDomain + this._separator + user;
 +    }
 +}
-Index: gnome-shell-45.3/js/gdm/loginDialog.js
-===================================================================
--- gnome-shell-45.3.orig/js/gdm/loginDialog.js
-+++ gnome-shell-45.3/js/gdm/loginDialog.js
+diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/loginDialog.js
+--- gnome-shell-46.4.orig/js/gdm/loginDialog.js	2024-08-08 13:52:20.504647335 -0500
+++ gnome-shell-46.4/js/gdm/loginDialog.js	2024-08-08 13:55:04.969310721 -0500
@@ -29,6 +29,7 @@ import Shell from 'gi://Shell';
 import St from 'gi://St';
 
@@ -251,7 +249,7 @@ Index: gnome-shell-45.3/js/gdm/loginDialog.js
 import * as Batch from './batch.js';
 import * as BoxPointer from '../ui/boxpointer.js';
 import * as CtrlAltTab from '../ui/ctrlAltTab.js';
-@@ -464,6 +465,10 @@ export const LoginDialog = GObject.regis
+@@ -535,6 +536,10 @@ export const LoginDialog = GObject.regis
         this._authPrompt.hide();
         this.add_child(this._authPrompt);
 
@@ -262,7 +260,7 @@ Index: gnome-shell-45.3/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.
-@@ -485,7 +490,18 @@ export const LoginDialog = GObject.regis
+@@ -556,7 +561,18 @@ export const LoginDialog = GObject.regis
 
         this._notListedButton.hide();
 
@@ -280,10 +278,10 @@ Index: gnome-shell-45.3/js/gdm/loginDialog.js
 +            this._userLayout.add_child(this._domainMenuButton.actor);
 +        } // domain end
 
-         this._bannerView = new St.ScrollView({
-             style_class: 'login-dialog-banner-view',
-@@ -1004,6 +1020,37 @@ export const LoginDialog = GObject.regis
-         }, this);
+         const bannerBox = new St.BoxLayout({vertical: true});
+ 
+@@ -1125,6 +1141,37 @@ export const LoginDialog = GObject.regis
+         conflictingSessionDialog.open();
     }
 
 +    _askForDomainUsernameAndBeginVerification(domain) {
@@ -320,7 +318,7 @@ Index: gnome-shell-45.3/js/gdm/loginDialog.js
     _startSession(serviceName) {
         this._bindOpacity();
         this.ease({
-@@ -1178,6 +1225,11 @@ export const LoginDialog = GObject.regis
+@@ -1332,6 +1379,11 @@ export const LoginDialog = GObject.regis
         this._askForUsernameAndBeginVerification();
     }
 
@@ -332,7 +330,7 @@ Index: gnome-shell-45.3/js/gdm/loginDialog.js
     _hideUserListAndBeginVerification() {
         this._hideUserList();
         this._authPrompt.begin();
-@@ -1191,6 +1243,9 @@ export const LoginDialog = GObject.regis
+@@ -1345,6 +1397,9 @@ export const LoginDialog = GObject.regis
         this._sessionMenuButton.hide();
         this._setUserListExpanded(true);
         this._notListedButton.show();
@@ -342,10 +340,9 @@ Index: gnome-shell-45.3/js/gdm/loginDialog.js
         this._userList.grab_key_focus();
     }
 
-Index: gnome-shell-45.3/js/js-resources.gresource.xml
-===================================================================
--- gnome-shell-45.3.orig/js/js-resources.gresource.xml
-+++ gnome-shell-45.3/js/js-resources.gresource.xml
+diff -urpN gnome-shell-46.4.orig/js/js-resources.gresource.xml gnome-shell-46.4/js/js-resources.gresource.xml
+--- gnome-shell-46.4.orig/js/js-resources.gresource.xml	2024-08-08 13:54:24.078981982 -0500
+++ gnome-shell-46.4/js/js-resources.gresource.xml	2024-08-08 13:55:04.969310721 -0500
@@ -3,6 +3,7 @@
   <gresource prefix="/org/gnome/shell">
     <file>gdm/authList.js</file>
@@ -354,10 +351,9 @@ Index: gnome-shell-45.3/js/js-resources.gresource.xml
     <file>gdm/batch.js</file>
     <file>gdm/credentialManager.js</file>
     <file>gdm/loginDialog.js</file>
-Index: gnome-shell-45.3/po/POTFILES.in
-===================================================================
--- gnome-shell-45.3.orig/po/POTFILES.in
-+++ gnome-shell-45.3/po/POTFILES.in
+diff -urpN gnome-shell-46.4.orig/po/POTFILES.in gnome-shell-46.4/po/POTFILES.in
+--- gnome-shell-46.4.orig/po/POTFILES.in	2024-08-08 13:52:20.521314138 -0500
+++ gnome-shell-46.4/po/POTFILES.in	2024-08-08 13:55:04.969310721 -0500
@@ -9,6 +9,7 @@ data/org.gnome.Shell.Extensions.desktop.
 data/org.gnome.Shell.PortalHelper.desktop.in.in
 js/dbusServices/extensions/ui/extension-error-page.ui
--- a/gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
+++ b/gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
@@ -1,7 +1,6 @@
-Index: gnome-shell-45.3/data/gnome-shell-theme.gresource.xml
-===================================================================
--- gnome-shell-45.3.orig/data/gnome-shell-theme.gresource.xml
-+++ gnome-shell-45.3/data/gnome-shell-theme.gresource.xml
+diff -urp gnome-shell-46.4.orig/data/gnome-shell-theme.gresource.xml gnome-shell-46.4/data/gnome-shell-theme.gresource.xml
+--- gnome-shell-46.4.orig/data/gnome-shell-theme.gresource.xml	2024-08-08 13:52:20.487980529 -0500
+++ gnome-shell-46.4/data/gnome-shell-theme.gresource.xml	2024-08-08 15:23:52.451210823 -0500
@@ -13,6 +13,7 @@
     <file>gnome-shell-light.css</file>
     <file>gnome-shell-high-contrast.css</file>
@@ -10,10 +9,9 @@ Index: gnome-shell-45.3/data/gnome-shell-theme.gresource.xml
     <file>pad-osd.css</file>
     <file>process-working-light.svg</file>
     <file>process-working-dark.svg</file>
-Index: gnome-shell-45.3/js/ui/screenShield.js
-===================================================================
--- gnome-shell-45.3.orig/js/ui/screenShield.js
-+++ gnome-shell-45.3/js/ui/screenShield.js
+diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/screenShield.js
+--- gnome-shell-46.4.orig/js/ui/screenShield.js	2024-08-08 13:52:20.514647416 -0500
+++ gnome-shell-46.4/js/ui/screenShield.js	2024-08-08 15:49:50.656867413 -0500
@@ -11,6 +11,7 @@ import St from 'gi://St';
 
 import * as Signals from '../misc/signals.js';
@@ -47,7 +45,7 @@ Index: gnome-shell-45.3/js/ui/screenShield.js
 
 +        // Add background for this._lockDialogGroup
 +        this._bgLockDialogGroup = new Clutter.Actor();
-+        this._lockDialogGroup.add_actor(this._bgLockDialogGroup);
+        this._lockDialogGroup.add_child(this._bgLockDialogGroup);
 +        this._lockDialogGroup.set_child_below_sibling(this._bgLockDialogGroup, null);
 +        this._bgManagersLockDialogGroup = [];
 +
@@ -55,8 +53,8 @@ Index: gnome-shell-45.3/js/ui/screenShield.js
 +        this._monitorsChangedId =
 +            Main.layoutManager.connect('monitors-changed', this._updateBgLockDialogGroup.bind(this));
 +
-         this.actor.add_actor(this._lockScreenGroup);
-         this.actor.add_actor(this._lockDialogGroup);
+         this.actor.add_child(this._lockScreenGroup);
+         this.actor.add_child(this._lockDialogGroup);
 
@@ -142,6 +158,15 @@ export class ScreenShield extends Signal
         this._cursorTracker = Meta.CursorTracker.get_for_display(global.display);
@@ -74,7 +72,7 @@ Index: gnome-shell-45.3/js/ui/screenShield.js
     }
 
     async _getLoginSession() {
-@@ -518,6 +543,53 @@ export class ScreenShield extends Signal
+@@ -517,6 +542,53 @@ export class ScreenShield extends Signal
         this.emit('wake-up-screen');
     }
 
--- a/gnome-shell-gdm-login-applet.patch
+++ b/gnome-shell-gdm-login-applet.patch
@@ -1,8 +1,7 @@
-Index: gnome-shell-45.3/js/js-resources.gresource.xml
-===================================================================
--- gnome-shell-45.3.orig/js/js-resources.gresource.xml
-+++ gnome-shell-45.3/js/js-resources.gresource.xml
-@@ -42,6 +42,7 @@
+diff -urpN gnome-shell-46.4.orig/js/js-resources.gresource.xml gnome-shell-46.4/js/js-resources.gresource.xml
+--- gnome-shell-46.4.orig/js/js-resources.gresource.xml	2024-08-08 16:03:02.309824096 -0500
+++ gnome-shell-46.4/js/js-resources.gresource.xml	2024-08-08 16:04:00.523595099 -0500
+@@ -43,6 +43,7 @@
     <file>misc/util.js</file>
     <file>misc/weather.js</file>
 
@@ -10,43 +9,9 @@ Index: gnome-shell-45.3/js/js-resources.gresource.xml
     <file>ui/accessDialog.js</file>
     <file>ui/altTab.js</file>
     <file>ui/animation.js</file>
-Index: gnome-shell-45.3/js/ui/panel.js
-===================================================================
--- gnome-shell-45.3.orig/js/ui/panel.js
-+++ gnome-shell-45.3/js/ui/panel.js
-@@ -36,6 +36,7 @@ import * as ThunderboltStatus from './st
- import * as AutoRotateStatus from './status/autoRotate.js';
- import * as BackgroundAppsStatus from './status/backgroundApps.js';
- 
-+import {AboutMenuButton} from './aboutMenu.js';
- import {DateMenuButton} from './dateMenu.js';
- import {ATIndicator} from './status/accessibility.js';
- import {InputSourceIndicator} from './status/keyboard.js';
-@@ -633,6 +634,7 @@ class QuickSettings extends PanelMenu.Bu
- });
- 
- const PANEL_ITEM_IMPLEMENTATIONS = {
-+    'aboutMenu': AboutMenuButton,
-     'activities': ActivitiesButton,
-     'appMenu': AppMenuButton,
-     'quickSettings': QuickSettings,
-Index: gnome-shell-45.3/js/ui/sessionMode.js
-===================================================================
--- gnome-shell-45.3.orig/js/ui/sessionMode.js
-+++ gnome-shell-45.3/js/ui/sessionMode.js
-@@ -60,7 +60,7 @@ const _modes = {
-             ? ['networkAgent', 'polkitAgent']
-             : ['polkitAgent'],
-         panel: {
-            left: [],
-+            left: ['aboutMenu'],
-             center: ['dateMenu'],
-             right: ['dwellClick', 'a11y', 'keyboard', 'quickSettings'],
-         },
-Index: gnome-shell-45.3/js/ui/aboutMenu.js
-===================================================================
--- /dev/null
-+++ gnome-shell-45.3/js/ui/aboutMenu.js
+diff -urpN gnome-shell-46.4.orig/js/ui/aboutMenu.js gnome-shell-46.4/js/ui/aboutMenu.js
+--- gnome-shell-46.4.orig/js/ui/aboutMenu.js	1969-12-31 18:00:00.000000000 -0600
+++ gnome-shell-46.4/js/ui/aboutMenu.js	2024-08-08 16:04:32.667170062 -0500
@@ -0,0 +1,144 @@
 +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 +
@@ -79,7 +44,7 @@ Index: gnome-shell-45.3/js/ui/aboutMenu.js
 +        this.menu.box.add_child(hbox);
 +
 +        vbox = new St.BoxLayout({vertical: true});
-+        hbox.add(vbox);
+        hbox.add_child(vbox);
 +
 +        ///// Section: read '/etc/os-release' to get pretty name
 +        //
@@ -106,7 +71,7 @@ Index: gnome-shell-45.3/js/ui/aboutMenu.js
 +        }
 +
 +        this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true });
-+        vbox.add(this._sysinfo);
+        vbox.add_child(this._sysinfo);
 +        this.hide();
 +
 +        this._updateHostnameId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
@@ -192,3 +157,34 @@ Index: gnome-shell-45.3/js/ui/aboutMenu.js
 +
 +    return hostname;
 +}
+diff -urpN gnome-shell-46.4.orig/js/ui/panel.js gnome-shell-46.4/js/ui/panel.js
+--- gnome-shell-46.4.orig/js/ui/panel.js	2024-08-08 16:03:02.319824171 -0500
+++ gnome-shell-46.4/js/ui/panel.js	2024-08-08 16:04:00.523595099 -0500
+@@ -36,6 +36,7 @@ import * as ThunderboltStatus from './st
+ import * as AutoRotateStatus from './status/autoRotate.js';
+ import * as BackgroundAppsStatus from './status/backgroundApps.js';
+ 
+import {AboutMenuButton} from './aboutMenu.js';
+ import {DateMenuButton} from './dateMenu.js';
+ import {ATIndicator} from './status/accessibility.js';
+ import {InputSourceIndicator} from './status/keyboard.js';
+@@ -631,6 +632,7 @@ class QuickSettings extends PanelMenu.Bu
+ });
+ 
+ const PANEL_ITEM_IMPLEMENTATIONS = {
+    'aboutMenu': AboutMenuButton,
+     'activities': ActivitiesButton,
+     'appMenu': AppMenuButton,
+     'quickSettings': QuickSettings,
+diff -urpN gnome-shell-46.4.orig/js/ui/sessionMode.js gnome-shell-46.4/js/ui/sessionMode.js
+--- gnome-shell-46.4.orig/js/ui/sessionMode.js	2024-08-08 16:03:02.323157529 -0500
+++ gnome-shell-46.4/js/ui/sessionMode.js	2024-08-08 16:04:00.523595099 -0500
+@@ -59,7 +59,7 @@ const _modes = {
+             ? ['networkAgent', 'polkitAgent']
+             : ['polkitAgent'],
+         panel: {
+-            left: [],
+            left: ['aboutMenu'],
+             center: ['dateMenu'],
+             right: ['dwellClick', 'a11y', 'keyboard', 'quickSettings'],
+         },
--- a/gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
+++ b/gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
@@ -1,10 +1,9 @@
-Index: gnome-shell-45.0/js/ui/status/keyboard.js
-===================================================================
--- gnome-shell-45.0.orig/js/ui/status/keyboard.js
-+++ gnome-shell-45.0/js/ui/status/keyboard.js
-@@ -274,6 +274,39 @@ class InputSourceSessionSettings extends
-         this._settings.connect(`changed::${this._KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
+diff -urp gnome-shell-46.4.orig/js/ui/status/keyboard.js gnome-shell-46.4/js/ui/status/keyboard.js
+--- gnome-shell-46.4.orig/js/ui/status/keyboard.js	2024-08-08 13:52:20.517980778 -0500
+++ gnome-shell-46.4/js/ui/status/keyboard.js	2024-08-08 15:51:36.434589734 -0500
+@@ -291,6 +291,39 @@ class InputSourceSessionSettings extends
         this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this));
+         this._settings.connect(`changed::${this._KEY_KEYBOARD_MODEL}`, this._emitKeyboardModelChanged.bind(this));
         this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this));
 +
 +        let sources = this._settings.get_value(this._KEY_INPUT_SOURCES);
--- a/gnome-shell.changes
+++ b/gnome-shell.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Aug  8 20:16:23 UTC 2024 - Michael Gorse <mgorse@suse.com>
+
+- Rebase SLE patches:
+  + gnome-shell-gdm-login-applet.patch
+  + gnome-shell-domain.patch
+  + gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
+  + gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
+- Comment out gs-fate318433-prevent-same-account-multi-logins.patch
+  Needs to be removed or rebased.
+
 -------------------------------------------------------------------
 Sun Aug  4 16:14:59 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>

--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -55,7 +55,7 @@ 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 gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
+# PATCH-NEEDS-REBASE 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-FIX-SLE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area
 Patch1008:      gnome-shell-disable-ibus-when-not-installed.patch
@@ -203,7 +203,7 @@ popd
 %patch -P 1002 -p1
 %patch -P 1003 -p1
 %patch -P 1004 -p1
-%patch -P 1007 -p1
+#%%patch -P 1007 -p1
 %patch -P 1008 -p1
 %patch -P 1009 -p1
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300