Accepting request 1226513 from GNOME:Factory

- 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. (forwarded request 1226345 from iznogood)

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

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">47.2</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>

gnome-shell-46.4.obscpio

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

gnome-shell-47.2.obscpio

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

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

@@ -1,27 +1,6 @@
-Index: gnome-shell-44.beta/data/meson.build
+Index: gnome-shell-47.beta/data/org.gnome.Shell-disable-extensions.service
 ===================================================================
---- 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
+--- gnome-shell-47.beta.orig/data/org.gnome.Shell-disable-extensions.service
 +++ /dev/null
 @@ -1,15 +0,0 @@
 -[Unit]
@@ -39,10 +18,10 @@ Index: gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service
 -# 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
+Index: gnome-shell-47.beta/data/org.gnome.Shell-disable-extensions.service.in
 ===================================================================
 --- /dev/null
-+++ gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service.in
++++ gnome-shell-47.beta/data/org.gnome.Shell-disable-extensions.service.in
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=Disable GNOME Shell extensions after failure

gnome-shell-exit-crash-workaround.patch

@@ -1,8 +1,8 @@
-Index: gnome-shell-45.0/src/main.c
+Index: gnome-shell-47.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)
+--- gnome-shell-47.0.orig/src/main.c
++++ gnome-shell-47.0/src/main.c
+@@ -718,7 +718,7 @@ main (int argc, char **argv)
    g_object_unref (shell_global_get ());
  
    g_debug ("Tearing down the mutter context");

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 d8c3e62f0..2642aca9e 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -163,9 +163,7 @@ export const InputMethod = GObject.registerClass({
+Index: gnome-shell-47.beta/js/misc/inputMethod.js
+===================================================================
+--- gnome-shell-47.beta.orig/js/misc/inputMethod.js
++++ gnome-shell-47.beta/js/misc/inputMethod.js
+@@ -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-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.changes

@@ -1,3 +1,101 @@
+-------------------------------------------------------------------
+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
-mtime: 1722708833
-commit: 7bbc1f21088b7227a47b93be70e43998972aa925
+version: 47.2
+mtime: 1732369855
+commit: dadd58f630eeea41d645ee225a63f719390829dc

gnome-shell.spec

@@ -17,11 +17,11 @@
 
 
 %global __requires_exclude typelib\\(Meta|MetaTest|Soup|St|Cogl|Clutter|TelepathyGlib\\)
-%define mutter_api 14
+%define mutter_api 15
 %define mutter_req 46.0
 
 Name:           gnome-shell
-Version:        46.4
+Version:        47.2
 Release:        0
 Summary:        GNOME Shell
 # shew extension is LGPL 2.1; gnome-shell-extension-tool is GPL-3.0-or-later
@@ -35,16 +35,12 @@ 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
+# PATCH-NEEDS-REBASE # 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
-# 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.
@@ -72,6 +68,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
@@ -190,11 +187,10 @@ pushd subprojects
 tar xf %{SOURCE1}
 mv libgnome-volume-control-0.gitmodule gvc
 popd
-%patch -P 1 -p1
-%patch -P 7 -p1
+# Patch needs rebase
+#%%patch -P 7 -p1
 %patch -P 8 -p1
 %patch -P 9 -p1
-%patch -P 10 -p1
 
 %if 0%{?sle_version}
 %patch -P 1001 -p1
@@ -243,7 +239,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
@@ -310,6 +305,8 @@ 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