Update to 46.2

Resolves: RHEL-38643
This commit is contained in:
Florian Müllner 2024-05-27 13:09:32 +02:00
parent e6414d8afc
commit dc3a53d901
No known key found for this signature in database
5 changed files with 3 additions and 106 deletions

1
.gitignore vendored
View File

@ -176,3 +176,4 @@
/gnome-shell-extensions-46.rc.tar.xz
/gnome-shell-extensions-46.0.tar.xz
/gnome-shell-extensions-46.1.tar.xz
/gnome-shell-extensions-46.2.tar.xz

View File

@ -1,30 +0,0 @@
From 4d04a035416867caec9d0aa83f90b4156f017ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 17 Mar 2016 17:15:38 +0100
Subject: [PATCH] apps-menu: Set label_actor of Category items
Category items are based on BaseMenuItem rather than MenuItem,
so the accessible relationship isn't set up automatically for us.
---
extensions/apps-menu/extension.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index c32b61aa..17bcf3b5 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -125,7 +125,10 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
else
name = _('Favorites');
- this.add_child(new St.Label({text: name}));
+ const label = new St.Label({text: name});
+ this.add_child(label);
+ this.actor.label_actor = label;
+
this.connect('motion-event', this._onMotionEvent.bind(this));
this.connect('notify::active', this._onActiveChanged.bind(this));
}
--
2.44.0

View File

@ -6,7 +6,7 @@
%global major_version %%(cut -d "." -f 1 <<<%{tarball_version})
Name: gnome-shell-extensions
Version: 46.1
Version: 46.2
Release: %autorelease
Summary: Modify and extend GNOME Shell functionality and behavior
@ -29,8 +29,6 @@ Patch: extra-extensions-0004-Add-heads-up-display.patch
Patch: extra-extensions-0005-Add-custom-menu-extension.patch
Patch: 0001-Include-top-icons-in-classic-session.patch
Patch: 0001-apps-menu-Set-label_actor-of-Category-items.patch
Patch: prefer-window-icon.patch
Patch: more-ws-previews-0001-workspace-indicator-Move-indicator-code-into-separat.patch
Patch: more-ws-previews-0002-workspace-indicator-Use-descendant-style-selectors.patch

View File

@ -1,72 +0,0 @@
From a344c1599edb64ffc4ad2b59de88616c6509bce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 19 Mar 2024 13:16:50 +0100
Subject: [PATCH 1/2] window-list: Use more appropriate fallback icon
'icon-missing' is not an actual icon name. It somewhat works
because an invalid icon name will fallback to the correct
'image-missing', however for apps the generic app icon is
a better fallback.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/315>
---
extensions/window-list/extension.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index 90bf34cd..c3ffe92f 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -165,7 +165,7 @@ class WindowTitle extends St.BoxLayout {
this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE);
} else {
this._icon.child = new St.Icon({
- icon_name: 'icon-missing',
+ icon_name: 'application-x-executable',
icon_size: ICON_TEXTURE_SIZE,
});
}
--
2.44.0
From c0cccebbdf543d25851872abdfdf119a5a9657aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 19 Mar 2024 14:07:12 +0100
Subject: [PATCH 2/2] window-list: Override with window icon if available
---
extensions/window-list/extension.js | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index c3ffe92f..034b72ba 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -169,6 +169,23 @@ class WindowTitle extends St.BoxLayout {
icon_size: ICON_TEXTURE_SIZE,
});
}
+
+ // Override with window icon if available
+ if (this._hasWindowIcon()) {
+ const textureCache = St.TextureCache.get_default();
+ this._icon.child.gicon = textureCache.bind_cairo_surface_property(
+ this._metaWindow, 'icon');
+ }
+ }
+
+ _hasWindowIcon() {
+ // HACK: GI cannot handle CairoSurface, so this
+ // will throw if the icon property is null
+ try {
+ return this._metaWindow.icon !== null;
+ } catch (e) {
+ return true;
+ }
}
}
--
2.44.0

View File

@ -1 +1 @@
SHA512 (gnome-shell-extensions-46.1.tar.xz) = 0eaa314a57679a45ceb205ba728856143b563b97a03e20455d7ffff54e3db24e53b5ce349e18ee4720dcdd79e13f5e7659624f3d23d06e249cb6213c960b281d
SHA512 (gnome-shell-extensions-46.2.tar.xz) = 81a12ff2f13e4b4cbc3ab75920ca6c4a2cdac9df42a1b1a04120fe8ede02b3b3cf3b9d93e6fdec0b4b8db0ce8e355eefdad79a7e4e40c1759f54c06d37edf370