From 1ece298221de26de86375eca7f7990a7979b43aa Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 1 May 2024 03:41:54 +0300 Subject: [PATCH] import gnome-shell-40.10-18.el9_4 --- SOURCES/0001-windowMenu-Ignore-release.patch | 26 +++++ ...erride-with-window-icon-if-available.patch | 46 ++++++++ SOURCES/optional-portal-helper.patch | 51 +++++++++ SOURCES/owe-support.patch | 107 ++++++++++++++++++ SPECS/gnome-shell.spec | 28 ++++- 5 files changed, 254 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-windowMenu-Ignore-release.patch create mode 100644 SOURCES/0001-windowPreview-Override-with-window-icon-if-available.patch create mode 100644 SOURCES/optional-portal-helper.patch create mode 100644 SOURCES/owe-support.patch diff --git a/SOURCES/0001-windowMenu-Ignore-release.patch b/SOURCES/0001-windowMenu-Ignore-release.patch new file mode 100644 index 0000000..bb55ef9 --- /dev/null +++ b/SOURCES/0001-windowMenu-Ignore-release.patch @@ -0,0 +1,26 @@ +From b3cac57511575e1265ab0ebd9c7465a6ade913e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 28 Sep 2023 14:34:24 +0200 +Subject: [PATCH] windowMenu: Ignore release + +If the menu was open on button-press, make sure it is kept open +until explicitly dismissed, regardless of the pointer position. +--- + js/ui/windowMenu.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/js/ui/windowMenu.js b/js/ui/windowMenu.js +index 3449f759da..ad5c2a74cc 100644 +--- a/js/ui/windowMenu.js ++++ b/js/ui/windowMenu.js +@@ -229,6 +229,7 @@ var WindowMenuManager = class { + let menu = new WindowMenu(window, this._sourceActor); + + this._manager.addMenu(menu); ++ this._manager.ignoreRelease(); + + menu.connect('activate', () => { + window.check_alive(global.get_current_time()); +-- +2.41.0 + diff --git a/SOURCES/0001-windowPreview-Override-with-window-icon-if-available.patch b/SOURCES/0001-windowPreview-Override-with-window-icon-if-available.patch new file mode 100644 index 0000000..c4cc0e9 --- /dev/null +++ b/SOURCES/0001-windowPreview-Override-with-window-icon-if-available.patch @@ -0,0 +1,46 @@ +From 1cad6c8d47fb9f0b17a2c47f93e5f923d1cb32c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 7 Mar 2024 18:22:32 +0100 +Subject: [PATCH] windowPreview: Override with window icon if available + +--- + js/ui/windowPreview.js | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js +index e67ec9ec0f..db325258b4 100644 +--- a/js/ui/windowPreview.js ++++ b/js/ui/windowPreview.js +@@ -123,6 +123,12 @@ var WindowPreview = GObject.registerClass({ + const tracker = Shell.WindowTracker.get_default(); + const app = tracker.get_window_app(this.metaWindow); + this._icon = app.create_icon_texture(ICON_SIZE); ++ // Override with window icon if available ++ if (this._hasWindowIcon()) { ++ const textureCache = St.TextureCache.get_default(); ++ this._icon.gicon = textureCache.bind_cairo_surface_property( ++ this.metaWindow, 'icon'); ++ } + this._icon.add_style_class_name('icon-dropshadow'); + this._icon.set({ + reactive: true, +@@ -226,6 +232,16 @@ var WindowPreview = GObject.registerClass({ + }); + } + ++ _hasWindowIcon() { ++ // HACK: GI cannot handle CairoSurface, so this ++ // will throw if the icon property is non-null ++ try { ++ return this.metaWindow.icon !== null; ++ } catch (e) { ++ return true; ++ } ++ } ++ + _updateIconScale() { + const { ControlsState } = OverviewControls; + const { currentState, initialState, finalState } = +-- +2.44.0 + diff --git a/SOURCES/optional-portal-helper.patch b/SOURCES/optional-portal-helper.patch new file mode 100644 index 0000000..956562b --- /dev/null +++ b/SOURCES/optional-portal-helper.patch @@ -0,0 +1,51 @@ +diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js +index 25f866281..a221c3b88 100644 +--- a/js/portalHelper/main.js ++++ b/js/portalHelper/main.js +@@ -4,10 +4,17 @@ imports.gi.versions.Soup = '2.4'; + + const Format = imports.format; + const Gettext = imports.gettext; +-const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi; ++const { Gio, GLib, GObject, Gtk, Pango, Soup } = imports.gi; + + const _ = Gettext.gettext; + ++let WebKit; ++try { ++ WebKit = imports.gi.WebKit2; ++} catch { ++ WebKit = null; ++} ++ + const Config = imports.misc.config; + const { loadInterfaceXML } = imports.misc.fileUtils; + +@@ -346,6 +353,11 @@ function initEnvironment() { + function main(argv) { + initEnvironment(); + ++ if (!WebKit) { ++ log('WebKit2 typelib is not installed, captive portal helper will be disabled'); ++ return 1; ++ } ++ + if (!WebKit.WebContext.new_ephemeral) { + log('WebKitGTK 2.16 is required for the portal-helper, see https://bugzilla.gnome.org/show_bug.cgi?id=780453'); + return 1; +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 01c83c86b..8c5bd8dcb 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -2070,7 +2070,9 @@ class Indicator extends PanelMenu.SystemIndicator { + new PortalHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PortalHelper', + '/org/gnome/Shell/PortalHelper', (proxy, error) => { + if (error) { +- log('Error launching the portal helper: %s'.format(error)); ++ // Timeout is expected if WebKit is unavailable ++ if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.TIMED_OUT)) ++ log('Error launching the portal helper: ' + error); + return; + } + + diff --git a/SOURCES/owe-support.patch b/SOURCES/owe-support.patch new file mode 100644 index 0000000..4dcb66f --- /dev/null +++ b/SOURCES/owe-support.patch @@ -0,0 +1,107 @@ +From ad431c28788ac1a4ec815cc4985cdb09a1a82226 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Mon, 11 Sep 2023 19:20:14 +0200 +Subject: [PATCH 1/2] status/network: Fix fallback SSID label + +We currently only return the fallback label if the string returned +from the ssid was invalid or couldn't be transformed to UTF-8. + +If the ssid parameter itself is empty, we throw an error. + +Handle this case as well, as callers otherwise would need to duplicate +the existing error path themselves. +--- + js/ui/status/network.js | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 1f17ca8f97..99a8d51f82 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -67,7 +67,9 @@ function signalToIcon(value) { + } + + function ssidToLabel(ssid) { +- let label = NM.utils_ssid_to_utf8(ssid.get_data()); ++ let label; ++ if (ssid) ++ label = NM.utils_ssid_to_utf8(ssid.get_data()); + if (!label) + label = _(""); + return label; +-- +2.41.0 + + +From 0409f18446cb55a45187e00feadb12e4389381dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 30 Aug 2023 01:47:00 +0200 +Subject: [PATCH 2/2] status/network: Use connection name with hidden AP + +When connected to an OWE transition network, NetworkManager +reports the connected API with a hidden SSID. + +Handle this by using the active connection's name before +ultimately falling back to the device name. + +https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6918 + +Part-of: + +--- + js/ui/status/network.js | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 99a8d51f82..b407d8e78d 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -1395,26 +1395,36 @@ var NMDeviceWireless = class { + _getStatus() { + let ap = this._device.active_access_point; + +- if (this._isHotSpotMaster()) ++ if (this._isHotSpotMaster()) { + /* Translators: %s is a network identifier */ + return _("%s Hotspot Active").format(this._description); +- else if (this._device.state >= NM.DeviceState.PREPARE && +- this._device.state < NM.DeviceState.ACTIVATED) ++ } else if (this._device.state >= NM.DeviceState.PREPARE && ++ this._device.state < NM.DeviceState.ACTIVATED) { + /* Translators: %s is a network identifier */ + return _("%s Connecting").format(this._description); +- else if (ap) +- return ssidToLabel(ap.get_ssid()); +- else if (!this._client.wireless_hardware_enabled) ++ } else if (ap) { ++ const ssid = ap.get_ssid(); ++ if (ssid) ++ return ssidToLabel(ssid); ++ ++ // Use connection name when connected to hidden AP ++ const activeConnection = this._device.get_active_connection(); ++ if (activeConnection) ++ return activeConnection.connection.get_id(); ++ ++ return ssidToLabel(null); ++ } else if (!this._client.wireless_hardware_enabled) { + /* Translators: %s is a network identifier */ + return _("%s Hardware Disabled").format(this._description); +- else if (!this._client.wireless_enabled) ++ } else if (!this._client.wireless_enabled) { + /* Translators: %s is a network identifier */ + return _("%s Off").format(this._description); +- else if (this._device.state == NM.DeviceState.DISCONNECTED) ++ } else if (this._device.state == NM.DeviceState.DISCONNECTED) { + /* Translators: %s is a network identifier */ + return _("%s Not Connected").format(this._description); +- else ++ } else { + return ''; ++ } + } + + _getMenuIcon() { +-- +2.41.0 + diff --git a/SPECS/gnome-shell.spec b/SPECS/gnome-shell.spec index 327a3fe..02a06e1 100644 --- a/SPECS/gnome-shell.spec +++ b/SPECS/gnome-shell.spec @@ -2,7 +2,7 @@ Name: gnome-shell Version: 40.10 -Release: 14%{?dist} +Release: 18%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -56,7 +56,11 @@ Patch52: 0001-osk-layouts-Replace-SS-extra-key-with.patch Patch53: 0001-po-Update-translations.patch Patch54: 0001-st-icon-Only-get-resource-scale-after-peeking-theme-.patch Patch55: 0001-window-tracker-Only-emit-tracked-windows-changed-on-.patch -Patch56: 0001-extensionSystem-Support-locking-down-extension-insta.patch +Patch56: owe-support.patch +Patch57: 0001-windowMenu-Ignore-release.patch +Patch58: optional-portal-helper.patch +Patch59: 0001-extensionSystem-Support-locking-down-extension-insta.patch +Patch60: 0001-windowPreview-Override-with-window-icon-if-available.patch %define eds_version 3.33.1 %define gnome_desktop_version 3.35.91 @@ -276,9 +280,25 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog -* Wed Feb 14 2024 Florian Müllner - 40.10-14 +* Tue Mar 19 2024 Florian Müllner - 40.10-18 +- Use window icon in overview if available + Resolves: RHEL-29659 + +* Sat Feb 10 2024 Florian Müllner - 40.10-17 - Allow restricting extension installation - Resolves: RHEL-25201 + Resolves: RHEL-25017 + +* Wed Nov 01 2023 Michael Catanzaro - 40.10-16 +- Disable captive portal helper if WebKitGTK is not installed + Resolves: RHEL-10487 + +* Wed Oct 18 2023 Florian Müllner - 40.10-15 +- Fix window-menu closing immediately on open + Resolves: RHEL-2663 + +* Wed Sep 06 2023 Florian Müllner - 40.10-14 +- Support OWE networks + Resolves: #2236665 * Mon May 15 2023 Ray Strode - 40.10-13 - Don't reset smartcard conversation twice when smartcard is inserted.