Accepting request 1297632 from GNOME:Factory

- Update to version 48.4:
  + Fix taking interactive screenshots via D-Bus.
  + Fix pointer scaling glitches in magnifier.
  + Fix drawing glitch in sliders in RTL locales.
  + Misc. bug fixes and cleanups.
  + Updated translations. (forwarded request 1297383 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/1297632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=276

CVE-2024-36472.patch

@@ -1,62 +0,0 @@
-diff --git a/js/ui/status/network.js b/dev/shm/tw/gnome-shell-js/ui/status/network.js
-index c3f0aa0..d9a5a86 100644
---- a/js/ui/status/network.js
-+++ b/dev/shm/tw/gnome-shell-js/ui/status/network.js
-@@ -1975,6 +1975,7 @@ class Indicator extends SystemIndicator {
-         this._mainConnection = null;
- 
-         this._notification = null;
-+        this._PortalNotification = null;
- 
-         this._wiredToggle = new NMWiredToggle();
-         this._wirelessToggle = new NMWirelessToggle();
-@@ -2083,8 +2084,10 @@ class Indicator extends SystemIndicator {
-     }
- 
-     _mainConnectionStateChanged() {
--        if (this._mainConnection.state === NM.ActiveConnectionState.ACTIVATED)
-+        if (this._mainConnection.state === NM.ActiveConnectionState.ACTIVATED) {
-             this._notification?.destroy();
-+            this._PortalNotification?.destroy();
-+        }
-     }
- 
-     _flushConnectivityQueue() {
-@@ -2119,7 +2122,7 @@ class Indicator extends SystemIndicator {
-         }
-     }
- 
--    async _syncConnectivity() {
-+    _syncConnectivity() {
-         if (this._mainConnection == null ||
-             this._mainConnection.state !== NM.ActiveConnectionState.ACTIVATED) {
-             this._flushConnectivityQueue();
-@@ -2137,10 +2140,28 @@ class Indicator extends SystemIndicator {
-         if (!isPortal || Main.sessionMode.isGreeter)
-             return;
- 
-+        let name = this._mainConnection.get_id();
-         let path = this._mainConnection.get_path();
-         if (this._connectivityQueue.has(path))
-             return;
- 
-+        this._PortalNotification?.destroy();
-+        const source = MessageTray.getSystemSource();
-+
-+        this._PortalNotification = new MessageTray.Notification({
-+            source,
-+            title: _('Sign Into Wi–Fi Network'),
-+            body: _(name),
-+        });
-+        this._PortalNotification.connect('activated',
-+            () => this._onNotificationActivated(path));
-+        this._PortalNotification.connect('destroy',
-+            () => (this._PortalNotification = null));
-+
-+        source.addNotification(this._PortalNotification);
-+    }
-+
-+    async _onNotificationActivated(path) {
-         let timestamp = global.get_current_time();
-         if (!this._portalHelperProxy) {
-             this._portalHelperProxy = new Gio.DBusProxy({

_service

@@ -3,11 +3,11 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
-    <param name="revision">46.4</param>
+    <param name="revision">48.4</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
-<!--    <param name="changesgenerate">enable</param> -->
+    <param name="changesgenerate">disable</param>
   </service>
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>

endSession-dialog-update-time-label-every-sec.patch

@@ -1,8 +1,8 @@
-Index: gnome-shell-45.0/js/ui/endSessionDialog.js
+Index: gnome-shell-48.rc/js/ui/endSessionDialog.js
 ===================================================================
---- gnome-shell-45.0.orig/js/ui/endSessionDialog.js
+--- gnome-shell-48.rc.orig/js/ui/endSessionDialog.js
-+++ gnome-shell-45.0/js/ui/endSessionDialog.js
++++ gnome-shell-48.rc/js/ui/endSessionDialog.js
-@@ -379,7 +379,10 @@ class EndSessionDialog extends ModalDial
+@@ -373,7 +373,10 @@ class EndSessionDialog extends ModalDial
  
          let description;
          let displayTime = _roundSecondsToInterval(

gnome-shell-46.4.obscpio

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

gnome-shell-48.4.obscpio

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

gnome-shell-add-linkoption-dl.patch

@@ -1,9 +1,9 @@
-Index: gnome-shell-45.0/src/meson.build
+Index: gnome-shell-48.rc/src/meson.build
 ===================================================================
---- gnome-shell-45.0.orig/src/meson.build
+--- gnome-shell-48.rc.orig/src/meson.build
-+++ gnome-shell-45.0/src/meson.build
++++ gnome-shell-48.rc/src/meson.build
-@@ -250,6 +250,7 @@ executable('gnome-shell', 'main.c',
+@@ -285,6 +285,7 @@ executable('gnome-shell', 'main.c',
-   include_directories: [conf_inc, st_inc, include_directories('tray')],
+   include_directories: [conf_inc],
    build_rpath: mutter_typelibdir,
    install_rpath: install_rpath,
 +  link_args: ['-ldl'],

gnome-shell-disable-ibus-when-not-installed.patch

@@ -7,11 +7,11 @@ Subject: [PATCH] Disable ibus when out of CJK
  js/misc/ibusManager.js | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: gnome-shell-45.0/js/misc/ibusManager.js
+Index: gnome-shell-48.rc/js/misc/ibusManager.js
 ===================================================================
---- gnome-shell-45.0.orig/js/misc/ibusManager.js
+--- gnome-shell-48.rc.orig/js/misc/ibusManager.js
-+++ gnome-shell-45.0/js/misc/ibusManager.js
++++ gnome-shell-48.rc/js/misc/ibusManager.js
-@@ -59,6 +59,10 @@ class IBusManager extends Signals.EventE
+@@ -52,6 +52,10 @@ class IBusManager extends Signals.EventE
      constructor() {
          super();
  
@@ -22,7 +22,7 @@ Index: gnome-shell-45.0/js/misc/ibusManager.js
          IBus.init();
  
          // This is the longest we'll keep the keyboard frozen until an input
-@@ -114,6 +118,10 @@ class IBusManager extends Signals.EventE
+@@ -107,6 +111,10 @@ class IBusManager extends Signals.EventE
      }
  
      _spawn(extraArgs = []) {

gnome-shell-disable-offline-update-dialog.patch

@@ -1,6 +1,8 @@
---- gnome-shell-41.orig/js/ui/endSessionDialog.js	2022-08-11 16:16:07.000000000 +0300
+Index: gnome-shell-48.rc/js/ui/endSessionDialog.js
-+++ gnome-shell-41/js/ui/endSessionDialog.js	2022-10-26 12:49:20.435238071 +0300
+===================================================================
-@@ -707,19 +703,7 @@
+--- gnome-shell-48.rc.orig/js/ui/endSessionDialog.js
++++ gnome-shell-48.rc/js/ui/endSessionDialog.js
+@@ -694,19 +694,7 @@ class EndSessionDialog extends ModalDial
      }
  
      async _getUpdateInfo() {
@@ -21,5 +23,3 @@
      }
  
      async OpenAsync(parameters, invocation) {
-         
-         

gnome-shell-domain.patch

@@ -1,6 +1,7 @@
-diff -urpN gnome-shell-46.4.orig/js/gdm/domain.js gnome-shell-46.4/js/gdm/domain.js
+Index: gnome-shell-48.rc/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
+--- /dev/null
++++ gnome-shell-48.rc/js/gdm/domain.js
 @@ -0,0 +1,236 @@
 +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 +/*
@@ -238,10 +239,11 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/domain.js gnome-shell-46.4/js/gdm/domain
 +        return this._activeDomain + this._separator + user;
 +    }
 +}
-diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/loginDialog.js
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/gdm/loginDialog.js
-@@ -29,6 +29,7 @@ import Shell from 'gi://Shell';
++++ gnome-shell-48.rc/js/gdm/loginDialog.js
+@@ -28,6 +28,7 @@ import Shell from 'gi://Shell';
  import St from 'gi://St';
  
  import * as AuthPrompt from './authPrompt.js';
@@ -249,7 +251,7 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/l
  import * as Batch from './batch.js';
  import * as BoxPointer from '../ui/boxpointer.js';
  import * as CtrlAltTab from '../ui/ctrlAltTab.js';
-@@ -535,6 +536,10 @@ export const LoginDialog = GObject.regis
+@@ -547,6 +548,10 @@ export const LoginDialog = GObject.regis
          this._authPrompt.hide();
          this.add_child(this._authPrompt);
  
@@ -260,7 +262,7 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/l
          // 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.
-@@ -556,7 +561,18 @@ export const LoginDialog = GObject.regis
+@@ -568,7 +573,18 @@ export const LoginDialog = GObject.regis
  
          this._notListedButton.hide();
  
@@ -278,9 +280,9 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/l
 +            this._userLayout.add_child(this._domainMenuButton.actor);
 +        } // domain end
  
-         const bannerBox = new St.BoxLayout({vertical: true});
+         const bannerBox = new St.BoxLayout({
- 
+             orientation: Clutter.Orientation.VERTICAL,
-@@ -1125,6 +1141,37 @@ export const LoginDialog = GObject.regis
+@@ -1185,6 +1201,37 @@ export const LoginDialog = GObject.regis
          conflictingSessionDialog.open();
      }
  
@@ -318,7 +320,7 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/l
      _startSession(serviceName) {
          this._bindOpacity();
          this.ease({
-@@ -1332,6 +1379,11 @@ export const LoginDialog = GObject.regis
+@@ -1397,6 +1444,11 @@ export const LoginDialog = GObject.regis
          this._askForUsernameAndBeginVerification();
      }
  
@@ -330,7 +332,7 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/l
      _hideUserListAndBeginVerification() {
          this._hideUserList();
          this._authPrompt.begin();
-@@ -1345,6 +1397,9 @@ export const LoginDialog = GObject.regis
+@@ -1410,6 +1462,9 @@ export const LoginDialog = GObject.regis
          this._sessionMenuButton.hide();
          this._setUserListExpanded(true);
          this._notListedButton.show();
@@ -340,9 +342,10 @@ diff -urpN gnome-shell-46.4.orig/js/gdm/loginDialog.js gnome-shell-46.4/js/gdm/l
          this._userList.grab_key_focus();
      }
  
-diff -urpN gnome-shell-46.4.orig/js/js-resources.gresource.xml gnome-shell-46.4/js/js-resources.gresource.xml
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/js-resources.gresource.xml
++++ gnome-shell-48.rc/js/js-resources.gresource.xml
 @@ -3,6 +3,7 @@
    <gresource prefix="/org/gnome/shell">
      <file>gdm/authList.js</file>
@@ -351,14 +354,15 @@ diff -urpN gnome-shell-46.4.orig/js/js-resources.gresource.xml gnome-shell-46.4/
      <file>gdm/batch.js</file>
      <file>gdm/credentialManager.js</file>
      <file>gdm/loginDialog.js</file>
-diff -urpN gnome-shell-46.4.orig/po/POTFILES.in gnome-shell-46.4/po/POTFILES.in
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/po/POTFILES.in
-@@ -9,6 +9,7 @@ data/org.gnome.Shell.Extensions.desktop.
++++ gnome-shell-48.rc/po/POTFILES.in
- data/org.gnome.Shell.PortalHelper.desktop.in.in
+@@ -11,6 +11,7 @@ data/X-GNOME-Shell-System.directory.desk
+ data/X-GNOME-Shell-Utilities.directory.desktop.in
  js/dbusServices/extensions/ui/extension-error-page.ui
  js/gdm/authPrompt.js
 +js/gdm/domain.js
  js/gdm/loginDialog.js
  js/gdm/util.js
- js/misc/systemActions.js
+ js/misc/breakManager.js

gnome-shell-executable-path-not-absolute.patch

@@ -1,61 +0,0 @@
-Index: gnome-shell-44.beta/data/meson.build
-===================================================================
---- gnome-shell-44.beta.orig/data/meson.build
-+++ gnome-shell-44.beta/data/meson.build
-@@ -117,8 +117,14 @@ if have_systemd
-     install_dir: systemduserunitdir
-   )
- 
--  units = files('org.gnome.Shell.target',
--                'org.gnome.Shell-disable-extensions.service')
-+  configure_file(
-+    input: 'org.gnome.Shell-disable-extensions.service.in',
-+    output: 'org.gnome.Shell-disable-extensions.service',
-+    configuration: unitconf,
-+    install_dir: systemduserunitdir
-+  )
-+
-+  units = files('org.gnome.Shell.target')
- 
-   install_data(units, install_dir: systemduserunitdir)
- endif
-Index: gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service
-===================================================================
---- gnome-shell-44.beta.orig/data/org.gnome.Shell-disable-extensions.service
-+++ /dev/null
-@@ -1,15 +0,0 @@
--[Unit]
--Description=Disable GNOME Shell extensions after failure
--# Note that this unit must not conflict with anything, and must
--# be able to run in parallel with the gnome-session-shutdown.target.
--DefaultDependencies=no
--
--# We want to disable extensions only if gnome-shell has flagged the extensions
--# to be a likely cause of trouble.
--ConditionPathExists=%t/gnome-shell-disable-extensions
--
--[Service]
--Type=simple
--# Disable extensions
--ExecStart=gsettings set org.gnome.shell disable-user-extensions true
--Restart=no
-Index: gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service.in
-===================================================================
---- /dev/null
-+++ gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service.in
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=Disable GNOME Shell extensions after failure
-+# Note that this unit must not conflict with anything, and must
-+# be able to run in parallel with the gnome-session-shutdown.target.
-+DefaultDependencies=no
-+
-+# We want to disable extensions only if gnome-shell has flagged the extensions
-+# to be a likely cause of trouble.
-+ConditionPathExists=%t/gnome-shell-disable-extensions
-+
-+[Service]
-+Type=simple
-+# Disable extensions
-+ExecStart=@bindir@/gsettings set org.gnome.shell disable-user-extensions true
-+Restart=no

gnome-shell-exit-crash-workaround.patch

@@ -1,13 +0,0 @@
-Index: gnome-shell-45.0/src/main.c
-===================================================================
---- gnome-shell-45.0.orig/src/main.c
-+++ gnome-shell-45.0/src/main.c
-@@ -736,7 +736,7 @@ main (int argc, char **argv)
-   g_object_unref (shell_global_get ());
- 
-   g_debug ("Tearing down the mutter context");
--  meta_context_destroy (g_steal_pointer (&context));
-+  g_steal_pointer (&context);
- 
-   return ecode;
- }

gnome-shell-fate324570-Make-GDM-background-image-configurable.patch

@@ -1,18 +1,20 @@
-diff -urp gnome-shell-46.4.orig/data/gnome-shell-theme.gresource.xml gnome-shell-46.4/data/gnome-shell-theme.gresource.xml
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/data/gnome-shell-theme.gresource.xml
-@@ -13,6 +13,7 @@
++++ gnome-shell-48.rc/data/gnome-shell-theme.gresource.xml
+@@ -7,6 +7,7 @@
      <file>gnome-shell-light.css</file>
      <file>gnome-shell-high-contrast.css</file>
      <file>gnome-shell-start.svg</file>
 +    <file>noise-texture.png</file>
      <file>pad-osd.css</file>
-     <file>process-working-light.svg</file>
+     <file>workspace-placeholder.svg</file>
-     <file>process-working-dark.svg</file>
+   </gresource>
-diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/screenShield.js
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/ui/screenShield.js
-@@ -11,6 +11,7 @@ import St from 'gi://St';
++++ gnome-shell-48.rc/js/ui/screenShield.js
+@@ -9,6 +9,7 @@ import St from 'gi://St';
  
  import * as Signals from '../misc/signals.js';
  
@@ -20,7 +22,7 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
  import * as GnomeSession from '../misc/gnomeSession.js';
  import * as OVirt from '../gdm/oVirt.js';
  import * as LoginManager from '../misc/loginManager.js';
-@@ -23,6 +24,8 @@ import * as SmartcardManager from '../mi
+@@ -21,6 +22,8 @@ import * as SmartcardManager from '../mi
  
  import {adjustAnimationTime} from '../misc/animationUtils.js';
  
@@ -29,17 +31,17 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
  const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
  const LOCK_ENABLED_KEY = 'lock-enabled';
  const LOCK_DELAY_KEY = 'lock-delay';
-@@ -32,6 +35,9 @@ const DISABLE_LOCK_KEY = 'disable-lock-s
+@@ -30,6 +33,9 @@ const DISABLE_LOCK_KEY = 'disable-lock-s
  
  const LOCKED_STATE_STR = 'screenShield.locked';
  
-+const BLUR_BRIGHTNESS = 0.55;
++const BLUR_BRIGHTNESS = 0.35;
-+const BLUR_SIGMA = 60;
++const BLUR_RADIUS = 90;
 +
  // ScreenShield animation time
  // - STANDARD_FADE_TIME is used when the session goes idle
  // - MANUAL_FADE_TIME is used for lowering the shield when asked by the user,
-@@ -74,6 +80,16 @@ export class ScreenShield extends Signal
+@@ -72,6 +78,16 @@ export class ScreenShield extends Signal
              name: 'lockDialogGroup',
          });
  
@@ -56,8 +58,8 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
          this.actor.add_child(this._lockScreenGroup);
          this.actor.add_child(this._lockDialogGroup);
  
-@@ -142,6 +158,15 @@ export class ScreenShield extends Signal
+@@ -140,6 +156,15 @@ export class ScreenShield extends Signal
-         this._cursorTracker = Meta.CursorTracker.get_for_display(global.display);
+         this._cursorTracker = global.backend.get_cursor_tracker();
  
          this._syncInhibitor();
 +
@@ -72,7 +74,7 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
      }
  
      async _getLoginSession() {
-@@ -517,6 +542,53 @@ export class ScreenShield extends Signal
+@@ -515,6 +540,59 @@ export class ScreenShield extends Signal
          this.emit('wake-up-screen');
      }
  
@@ -84,6 +86,7 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
 +            y: monitor.y,
 +            width: monitor.width,
 +            height: monitor.height,
++            effect: new Shell.BlurEffect({name: 'blur'}),
 +        });
 +
 +        let bgManager = new Background.BackgroundManager({
@@ -98,17 +101,8 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
 +        this._bgLockDialogGroup.add_child(widget);
 +
 +        const themeContext = St.ThemeContext.get_for_stage(global.stage);
-+
++        themeContext.connectObject('notify::scale-factor',
-+        let effect = new Shell.BlurEffect({
++            () => this._updateBackgroundEffects(), this);
-+            brightness: BLUR_BRIGHTNESS,
-+            sigma: BLUR_SIGMA * themeContext.scale_factor,
-+        });
-+
-+        this._scaleChangedId = themeContext.connect('notify::scale-factor', () => {
-+            effect.sigma = BLUR_SIGMA * themeContext.scale_factor;
-+        });
-+
-+        widget.add_effect(effect);
 +    }
 +
 +    _updateBgLockDialogGroup() {
@@ -120,8 +114,22 @@ diff -urp gnome-shell-46.4.orig/js/ui/screenShield.js gnome-shell-46.4/js/ui/scr
 +
 +        for (let i = 0; i < Main.layoutManager.monitors.length; i++)
 +            this._createBgLockDialogGroup(i);
++        this._updateBackgroundEffects();
 +    }
 +
++    _updateBackgroundEffects() {
++        const themeContext = St.ThemeContext.get_for_stage(global.stage);
++
++        for (const widget of this._bgLockDialogGroup) {
++            const effect = widget.get_effect('blur');
++            if (effect) {
++               effect.set({
++                  brightness: BLUR_BRIGHTNESS,
++                  radius: BLUR_RADIUS * themeContext.scale_factor,
++               });
++            }
++        }
++    }
 +
      get locked() {
          return this._isLocked;

gnome-shell-fix-cursor-on-hide-preedit.patch

@@ -10,11 +10,11 @@ currently it will pass 1, which is the wrong previous value.
  js/misc/inputMethod.js | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
+Index: gnome-shell-47.beta/js/misc/inputMethod.js
-index d8c3e62f0..2642aca9e 100644
+===================================================================
---- a/js/misc/inputMethod.js
+--- gnome-shell-47.beta.orig/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
++++ gnome-shell-47.beta/js/misc/inputMethod.js
-@@ -163,9 +163,7 @@ export const InputMethod = GObject.registerClass({
+@@ -161,9 +161,7 @@ export const InputMethod = GObject.regis
      }
  
      _onHidePreeditText() {
@@ -25,6 +25,3 @@ index d8c3e62f0..2642aca9e 100644
          this._preeditVisible = false;
      }
  
--- 
-2.45.0
-

gnome-shell-gdm-login-applet.patch

@@ -1,7 +1,8 @@
-diff -urpN gnome-shell-46.4.orig/js/js-resources.gresource.xml gnome-shell-46.4/js/js-resources.gresource.xml
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/js-resources.gresource.xml
-@@ -43,6 +43,7 @@
++++ gnome-shell-48.rc/js/js-resources.gresource.xml
+@@ -45,6 +45,7 @@
      <file>misc/util.js</file>
      <file>misc/weather.js</file>
  
@@ -9,9 +10,10 @@ diff -urpN gnome-shell-46.4.orig/js/js-resources.gresource.xml gnome-shell-46.4/
      <file>ui/accessDialog.js</file>
      <file>ui/altTab.js</file>
      <file>ui/animation.js</file>
-diff -urpN gnome-shell-46.4.orig/js/ui/aboutMenu.js gnome-shell-46.4/js/ui/aboutMenu.js
+Index: gnome-shell-48.rc/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
+--- /dev/null
++++ gnome-shell-48.rc/js/ui/aboutMenu.js
 @@ -0,0 +1,144 @@
 +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 +
@@ -157,10 +159,11 @@ diff -urpN gnome-shell-46.4.orig/js/ui/aboutMenu.js gnome-shell-46.4/js/ui/about
 +
 +    return hostname;
 +}
-diff -urpN gnome-shell-46.4.orig/js/ui/panel.js gnome-shell-46.4/js/ui/panel.js
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/ui/panel.js
-@@ -36,6 +36,7 @@ import * as ThunderboltStatus from './st
++++ gnome-shell-48.rc/js/ui/panel.js
+@@ -34,6 +34,7 @@ import * as ThunderboltStatus from './st
  import * as AutoRotateStatus from './status/autoRotate.js';
  import * as BackgroundAppsStatus from './status/backgroundApps.js';
  
@@ -168,7 +171,7 @@ diff -urpN gnome-shell-46.4.orig/js/ui/panel.js gnome-shell-46.4/js/ui/panel.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
+@@ -629,6 +630,7 @@ class QuickSettings extends PanelMenu.Bu
  });
  
  const PANEL_ITEM_IMPLEMENTATIONS = {
@@ -176,10 +179,11 @@ diff -urpN gnome-shell-46.4.orig/js/ui/panel.js gnome-shell-46.4/js/ui/panel.js
      '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
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/ui/sessionMode.js
-@@ -59,7 +59,7 @@ const _modes = {
++++ gnome-shell-48.rc/js/ui/sessionMode.js
+@@ -57,7 +57,7 @@ const _modes = {
              ? ['networkAgent', 'polkitAgent']
              : ['polkitAgent'],
          panel: {

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

@@ -1,6 +1,7 @@
-diff -urp gnome-shell-46.4.orig/js/ui/status/keyboard.js gnome-shell-46.4/js/ui/status/keyboard.js
+Index: gnome-shell-48.rc/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
+--- gnome-shell-48.rc.orig/js/ui/status/keyboard.js
++++ gnome-shell-48.rc/js/ui/status/keyboard.js
 @@ -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));

gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch

@@ -1,8 +1,8 @@
-Index: gnome-shell-45.0/js/ui/endSessionDialog.js
+Index: gnome-shell-48.rc/js/ui/endSessionDialog.js
 ===================================================================
---- gnome-shell-45.0.orig/js/ui/endSessionDialog.js
+--- gnome-shell-48.rc.orig/js/ui/endSessionDialog.js
-+++ gnome-shell-45.0/js/ui/endSessionDialog.js
++++ gnome-shell-48.rc/js/ui/endSessionDialog.js
-@@ -300,7 +300,7 @@ class EndSessionDialog extends ModalDial
+@@ -294,7 +294,7 @@ class EndSessionDialog extends ModalDial
          this.contentLayout.add_child(this._applicationSection);
  
          this._sessionSection = new Dialog.ListSection({
@@ -11,7 +11,7 @@ Index: gnome-shell-45.0/js/ui/endSessionDialog.js
          });
          this.contentLayout.add_child(this._sessionSection);
  
-@@ -753,8 +753,8 @@ class EndSessionDialog extends ModalDial
+@@ -747,8 +747,8 @@ class EndSessionDialog extends ModalDial
              this._applications.push(inhibitor);
          }
  

gnome-shell-private-connection.patch

@@ -1,39 +0,0 @@
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index e3b9a5d..3296e1d 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -940,6 +940,11 @@ const WirelessNetwork = GObject.registerClass({
-                 this._getDeviceDBusPath(), ap.get_path());
-         } else {
-             conn = new NM.SimpleConnection();
-+            if (this._IsPrivateConnections()) {
-+                let connectionSetting = new NM.SettingConnection();
-+                connectionSetting.add_permission('user', GLib.get_user_name(), null);
-+                conn.add_setting(connectionSetting);
-+            }
-             this._device.client.add_and_activate_connection_async(
-                 conn, this._device, ap.get_path(), null, null);
-         }
-@@ -949,6 +954,22 @@ const WirelessNetwork = GObject.registerClass({
-         this.emit('destroy');
-     }
- 
-+    _IsPrivateConnections() {
-+        let privateConnections = true;
-+        let authority = Polkit.Authority.get_sync(null);
-+        let credential = new Gio.Credentials();
-+        let subject = new Polkit.UnixProcess({ pid: credential.get_unix_pid(), uid: credential.get_unix_user() });
-+        let authResult = authority.check_authorization_sync(subject,
-+                                                            'org.freedesktop.NetworkManager.settings.modify.system',
-+                                                            null /* details */,
-+                                                            Polkit.CheckAuthorizationFlags.NONE,
-+                                                            null /* cancellable */);
-+        if (authResult)
-+            privateConnections = !authResult.get_is_authorized();
-+
-+        return privateConnections;
-+    }
-+
-     _getDeviceDBusPath() {
-         // nm_object_get_path() is shadowed by nm_device_get_path()
-         return NM.Object.prototype.get_path.call(this._device);

gnome-shell-screen-disappear.patch

@@ -1,16 +0,0 @@
-Index: gnome-shell-45.0/js/gdm/authPrompt.js
-===================================================================
---- gnome-shell-45.0.orig/js/gdm/authPrompt.js
-+++ gnome-shell-45.0/js/gdm/authPrompt.js
-@@ -627,8 +627,10 @@ export const AuthPrompt = GObject.regist
-         this._updateEntry(true);
-         this.stopSpinning();
- 
--        if (oldStatus === AuthPromptStatus.VERIFICATION_FAILED)
-+        if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED) {
-+            this._userVerifier.cancel();
-             this.emit('failed');
-+        }
-         else if (oldStatus === AuthPromptStatus.VERIFICATION_CANCELLED)
-             this.emit('cancelled');
- 

gnome-shell.changes

@@ -1,3 +1,296 @@
+-------------------------------------------------------------------
+Mon Aug  4 06:14:34 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.4:
+  + Fix taking interactive screenshots via D-Bus.
+  + Fix pointer scaling glitches in magnifier.
+  + Fix drawing glitch in sliders in RTL locales.
+  + Misc. bug fixes and cleanups.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Jun 29 17:27:46 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.3:
+  + Check all modifiers for modifier-scroll
+  + Fix visibility of emoji key in on-screen-keyboard
+  + Add missing accessibility labels in various components
+  + Allow users to correct keyring password after failure
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon May 26 14:25:28 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.2:
+  + Only enable surrounding-text IM capability when needed
+  + Fix launching command from terminal in run dialog
+  + Ignore offset changes caused by suspend for screen time
+  + Fix app folders sometimes not closing after outside clicks
+  + Fixed crash
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Apr 24 08:58:07 UTC 2025 - Alynx Zhou <alynx.zhou@suse.com>
+
+- Drop gnome-shell-executable-path-not-absolute.patch: The original
+  patch did not work as expected, and assuming gsettings is in the
+  bin dir of gnome-shell is not correct, so keep relative path
+  (bsc#1241666).
+
+-------------------------------------------------------------------
+Mon Apr 14 05:36:07 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 48.1:
+  + Fix glitch in sliders when close to maximum.
+  + Fix detecting suspend/resume for time tracking.
+  + Fix wrongly sized images with fractional scaling.
+  + Fix frozen cursor when using magnifier in push mode.
+  + Fix session button on login screen after wrong password.
+  + Misc. bug fixes and cleanups.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Mar 20 15:47:47 UTC 2025 - bjorn.lie@gmail.com
+
+- Update to version 48.0+6:
+  * slider: Align handle size with with pixel grid
+  * slider: Use correct handle size when calculating rightmost
+    position
+  * Revert "ci: Disable container building temporarily"
+  * Revert "ci: Disable sysext temporarily"
+  * Updated translations.
+
+-------------------------------------------------------------------
+Tue Mar 18 19:20:04 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Clean up conditionals and use autopatch.
+
+-------------------------------------------------------------------
+Mon Mar 17 01:00:18 UTC 2025 - Xiaoguang Wang <xiaoguang.wang@suse.com>
+
+- Update patches:
+  + endSession-dialog-update-time-label-every-sec.patch
+  + gnome-shell-add-linkoption-dl.patch
+  + gnome-shell-disable-ibus-when-not-installed.patch
+  + gnome-shell-disable-offline-update-dialog.patch
+  + gnome-shell-domain.patch
+  + gnome-shell-executable-path-not-absolute.patch
+  + gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
+  + gnome-shell-gdm-login-applet.patch
+  + gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
+  + gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
+  + gnome-shell-screen-disappear.patch
+
+- Drop upstream patches:
+  + gnome-shell-exit-crash-workaround.patch
+  + gnome-shell-screen-disappear.patch
+
+-------------------------------------------------------------------
+Sun Mar 16 14:53:08 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.0:
+  + Fix ibus candidate popup position
+  + breakManager: Allow break to be taken or delayed when overdue
+  + Fix audio selection dialog in light style
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Mar 14 00:54:32 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Drop use of sle_version in favor of is_opensuse and suse_version.
+  Sle_version is no longer used in SLE 16.
+
+-------------------------------------------------------------------
+Mon Mar  3 23:17:09 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.rc:
+  + Fix integer scaling for spinner
+  + Group notifications by app
+  + Fix tracking inactive time for screen time limits
+  + Fix occasional stacking glitch during overview transition
+  + Reorganize default dash/grid/folder apps
+  + Handle suspend/resume when tracking screen time
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar  3 23:17:08 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.beta:
+  + Fix overlapping tiles in app grid on hover
+  + Improve screen time limit support
+  + Fix default user avatar with light style
+  + Transition to new BoxLayout.orientation property
+  + Allow tracking screen time history with no limit set
+  + Fix Extensions app losing state after shell restart
+  + Support loading login banner message from file
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar  3 23:17:07 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 48.alpha:
+  + Improve quick settings accessibility
+  + Use accent color in tablet configuration UI
+  + Improve accuracy of inset box shadows
+  + Fix `PopupSwitchMenuItem::toggled` passing wrong state
+  + Consider text direction when handling arrow keys in sliders
+  + Fix layout issues with new dialog style
+  + Fix uneven padding in notification headers
+  + Fix graphical artifacts in partially-rounded buttons
+  + Do not depend on gnome-menus for folder translations
+  + Fix caret tracking in magnifier
+  + Show OSD notification for headphone connection
+  + Improve accessibility of keyboard backlight quick settings
+    toggle
+  + Fix resetting non-caps shift key in on-screen keyboard
+  + Improve contrast of notification placeholder
+  + Add support for screen time / health breaks
+  + Add sysext support to toolbox tooling
+  + Modernize spinner [Florian; !3565]
+  + extensions-app: Allow closing with ctrl+w
+  + Fix Escape handling in run dialog
+  + Fix custom text-scaling-factor getting reset
+  + Tweak ibus candidate popover appearance
+  + Add convenience logging API for extensions
+  + Improve on-screen keyboard appearance
+  + Tweak quick settings appearance
+  + Add support for screen time limits
+  + Fixed crash
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+- Drop pkgconfig(mutter-cogl-pango-%%{mutter_api}) BuildRequires:
+  no longer needed nor available.
+
+-------------------------------------------------------------------
+Mon Mar  3 23:17:06 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.5:
+  + Fix occasional stacking glitch during overview transition
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Feb  5 12:27:12 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.4:
+  + Fix overlapping tiles in app grid on hover
+  + Fix default user avatar with light style
+  + Fixed crash
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Jan 13 12:50:32 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.3:
+  + Fix Escape handling in run dialog
+  + Fix custom text-scaling-factor getting reset
+  + Tweak ibus candidate popover appearance
+  + Misc. bug fixes and cleanups
+
+-------------------------------------------------------------------
+Mon Nov 25 19:59:34 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.2:
+  + Fix graphical artifacts in partially-rounded buttons
+  + Fix caret tracking in magnifier
+  + Improve accessibility of keyboard backlight quick settings
+    toggle
+  + Fix resetting non-caps shift key in on-screen keyboard
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Nov 08 19:28:51 UTC 2024 - bjorn.lie@gmail.com
+
+- Update to version 47.1+6:
+  + st/theme-node-drawing: Don't skip square top left inset shadow
+    corners
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Oct 19 08:44:46 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.1:
+  + Improve quick settings accessibility
+  + Use accent color in tablet configuration UI
+  + Improve accuracy of inset box shadows
+  + Fix `PopupSwitchMenuItem::toggled` passing wrong state
+  + Consider text direction when handling arrow keys in sliders
+  + Fix layout issues with new dialog style
+  + Fix uneven padding in notification headers
+  + Fixed crash
+  + Misc. cleanups and bug
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Sep 16 20:55:02 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.0:
+  + Fix new wifi connections for restricted users
+  + Do not disable required animations
+  + Fix showing pending PAM messages on login screen
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+- Drop gnome-shell-private-connection.patch: Following changes
+  upstream, this patch should not be needed anymore.
+- Refresh gnome-shell-exit-crash-workaround.patch with quilt.
+- Disable gnome-shell-executable-path-not-absolute.patch: Needs
+  rebase or dropping.
+
+-------------------------------------------------------------------
+Mon Sep 16 19:08:17 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.rc:
+  + Fix smartcard logins
+  + Mark drag to dash as move operation
+  + Use rst2man to generate man pages
+  + Fix glitch when quick settings menu animation is interrupted
+  + Plugged leak
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+- Add docutils BuildRequires, new dependency (rst2man).
+
+-------------------------------------------------------------------
+Mon Sep 16 18:22:47 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 47.beta:
+  + Use hardware encoding for screen recordings if possible
+  + Allow notification portal to always use GTK protocol
+  + Improve Persian on-screen keyboard layout
+  + Build and publish GNOME OS systemd-sysext extensions
+  + Make overview startup notification more reliable
+  + Fix keyboard navigation in app folders
+  + Support exporting DebugControl service from looking glass
+  + Use low-power pipeline in screen recorder if possible
+  + Show notification when detecting captive portal
+  + Fix connecting to WPA2 enterprise networks
+  + Use unlinked rounded buttons in notifications and dialogs
+  + Misc. bug fixes and cleanups
+- Bump mutter_api to 15 following upstream changes.
+- Rebase patches with quilt, drop CVE-2024-36472.patch, fixed
+  upstream.
+
+-------------------------------------------------------------------
+Sun Sep 15 12:09:55 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 46.5:
+  + Fix smartcard logins
+  + Fix glitch when quick settings menu animation is interrupted
+  + Fix new wifi connections for restricted users
+  + Do not disable required animations
+  + Fix showing pending PAM messages on login screen
+  + Plugged leak
+  + Misc. bug fixes and cleanups
+  + Updated translations.
+- Drop gnome-shell-private-connection.patch: Should not be needed
+  anymore after changes upstream.
+
 -------------------------------------------------------------------
 Mon Aug 12 17:28:18 UTC 2024 - Michael Gorse <mgorse@suse.com>
 

gnome-shell.obsinfo

@@ -1,4 +1,4 @@
 name: gnome-shell
-version: 46.4
+version: 48.4
-mtime: 1722708833
+mtime: 1754218414
-commit: 7bbc1f21088b7227a47b93be70e43998972aa925
+commit: 79e9cc46e0ef5d595457f0766a1e372f05bd460b

gnome-shell.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-shell
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,11 +17,11 @@
 
 
 %global __requires_exclude typelib\\(Meta|MetaTest|Soup|St|Cogl|Clutter|TelepathyGlib\\)
-%define mutter_api 14
+%define mutter_api 16
-%define mutter_req 46.0
+%define mutter_req 48.alpha
 
 Name:           gnome-shell
-Version:        46.4
+Version:        48.4
 Release:        0
 Summary:        GNOME Shell
 # shew extension is LGPL 2.1; gnome-shell-extension-tool is GPL-3.0-or-later
@@ -35,24 +35,14 @@ Source1:        libgnome-volume-control-0.gitmodule.tar.zst
 # SOURCE-FEATURE-OPENSUSE noise-texture boo#1176418 qkzhu@suse.com -- Add noise-texture as the default greeter background, used by patch4.
 Source100:      noise-texture.png
 
-# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
-Patch1:         gnome-shell-private-connection.patch
-# PATCH-FIX-OPENSUSE gnome-shell-executable-path-not-absolute.patch bsc#1176051 xwang@suse.com --  Fix ExecStart is not absolute path
-Patch7:         gnome-shell-executable-path-not-absolute.patch
-# PATCH-FIX-UPSTREAM gnome-shell-exit-crash-workaround.patch bsc#1190878 glgo#GNOME/gnome-shell#4344 qkzhu@suse.com -- Workaround logout crashing
-Patch8:         gnome-shell-exit-crash-workaround.patch
 # PATCH-FIX-UPSTREAM gnome-shell-fix-cursor-on-hide-preedit.patch glgo#GNOME/gnome-shell!3318 alynx.zhou@suse.com -- Correctly reset cursor when hide preedit
-Patch9:         gnome-shell-fix-cursor-on-hide-preedit.patch
+Patch1:         gnome-shell-fix-cursor-on-hide-preedit.patch
-# PATCH-FIX-UPSTREAM CVE-2024-36472.patch glgo#GNOME/gnome-shell#7688 bsc#1225567 xiaoguang.wang@suse.com -- Show notification when detecting captive portal
-Patch10:        CVE-2024-36472.patch
 
 ## NOTE: Keep SLE-only patches at bottom (starting on 1000).
 # PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
 Patch1001:      gnome-shell-gdm-login-applet.patch
 # PATCH-FEATURE-SLE gnome-shell-domain.patch fate#307773 dliang@suse.com -- Active Directory Integration
 Patch1002:      gnome-shell-domain.patch
-# PATCH-FIX-SLE gnome-shell-screen-disappear.patch bnc#870217 dliang@suse.com -- screen disapper.
-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-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area
@@ -72,6 +62,7 @@ Patch1013:      gnome-shell-add-linkoption-dl.patch
 BuildRequires:  asciidoc
 BuildRequires:  dbus-1
 BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  docutils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  meson >= 0.58.0
@@ -117,7 +108,6 @@ BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mutter-clutter-%{mutter_api}) >= %{mutter_req}
 BuildRequires:  pkgconfig(mutter-cogl-%{mutter_api}) >= %{mutter_req}
-BuildRequires:  pkgconfig(mutter-cogl-pango-%{mutter_api}) >= %{mutter_req}
 BuildRequires:  pkgconfig(polkit-agent-1) >= 0.100
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  python(abi) >= 3
@@ -190,25 +180,10 @@ pushd subprojects
 tar xf %{SOURCE1}
 mv libgnome-volume-control-0.gitmodule gvc
 popd
-%patch -P 1 -p1
+%autopatch -p1 -M 999
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
 
-%if 0%{?sle_version}
+%if !0%{?is_opensuse} || 0%{?suse_version} <= 1600
-%patch -P 1001 -p1
+%autopatch -p1 -m 1000
-%patch -P 1002 -p1
-%patch -P 1003 -p1
-%patch -P 1004 -p1
-%patch -P 1008 -p1
-%patch -P 1009 -p1
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
-%patch -P 1010 -p1
-%patch -P 1011 -p1
-%endif
-%patch -P 1012 -p1
-%patch -P 1013 -p1
 %endif
 
 cp %{SOURCE100} data/theme/
@@ -243,7 +218,6 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
 %doc README.md NEWS
 %{_bindir}/gnome-shell
 %{_bindir}/gnome-extensions
-%{_bindir}/gnome-shell-extension-prefs
 %{_bindir}/gnome-shell-extension-tool
 %{_bindir}/gnome-shell-test-tool
 %dir %{_libdir}/gnome-shell
@@ -261,6 +235,7 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
 %{_libdir}/gnome-shell/libst-%{mutter_api}.so
 %{_datadir}/applications/org.gnome.Shell.desktop
 %{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
+%{_datadir}/dbus-1/interfaces/org.gnome.Shell.ScreenTime.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Introspect.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml
@@ -310,12 +285,16 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
 %{_datadir}/bash-completion/completions/gnome-extensions
 %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.CaptivePortal.svg
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg
 %{_userunitdir}/org.gnome.Shell-disable-extensions.service
 %{_datadir}/applications/org.gnome.Shell.Extensions.desktop
 %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Extensions.xml
 %{_datadir}/dbus-1/services/org.gnome.Shell.Extensions.service
 %{_datadir}/gnome-shell/org.gnome.Shell.Extensions
 %{_datadir}/gnome-shell/org.gnome.Shell.Extensions.src.gresource
+%{_datadir}/desktop-directories/X-GNOME-Shell-Utilities.directory
+%{_datadir}/desktop-directories/X-GNOME-Shell-System.directory
 
 %files devel
 %doc %{_datadir}/doc/shell/