diff --git a/.gitignore b/.gitignore index fbf0e31..6b1db34 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-47.3.tar.xz /gnome-shell-47.4.tar.xz /gnome-shell-47.5.tar.xz +/gnome-shell-47.6.tar.xz diff --git a/0001-panel-Bring-the-upstream-workspace-dots-back.patch b/0001-panel-Bring-the-upstream-workspace-dots-back.patch new file mode 100644 index 0000000..e7cefc9 --- /dev/null +++ b/0001-panel-Bring-the-upstream-workspace-dots-back.patch @@ -0,0 +1,45 @@ +From 7f183e4aaa76d581e773fa415e5bcd9e5e54b3cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Hern=C3=A1ndez=20Ant=C3=BAnez?= + +Date: Tue, 20 May 2025 01:04:03 +0200 +Subject: [PATCH] panel: Bring the upstream workspace dots back + +The activities button now includes both the icon and the workspace +indicators. + +Also, remove the distribution id check. +--- + js/ui/panel.js | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/js/ui/panel.js b/js/ui/panel.js +index 5e19203be..314c839a1 100644 +--- a/js/ui/panel.js ++++ b/js/ui/panel.js +@@ -423,15 +423,14 @@ class ActivitiesButton extends PanelMenu.Button { + accessible_name: _('Activities'), + }); + +- if (GLib.get_os_info('ID') === 'rhel') { +- const logoIcon = new St.Icon({ +- icon_name: 'fedora-logo-icon', +- style_class: 'activities-logo', +- }); +- this.add_child(logoIcon); +- } else { +- this.add_child(new WorkspaceIndicators()); +- } ++ const box = new St.BoxLayout({vertical: false}); ++ const logoIcon = new St.Icon({ ++ icon_name: 'fedora-logo-icon', ++ style_class: 'activities-logo', ++ }); ++ box.add_child(logoIcon); ++ box.add_child(new WorkspaceIndicators()); ++ this.add_child(box); + + Main.overview.connectObject('showing', + () => this.add_style_pseudo_class('checked'), +-- +2.47.1 + diff --git a/0001-panel-Use-branding-in-activities-button.patch b/0001-panel-Use-branding-in-activities-button.patch index e82fb76..fb3ce1c 100644 --- a/0001-panel-Use-branding-in-activities-button.patch +++ b/0001-panel-Use-branding-in-activities-button.patch @@ -34,7 +34,7 @@ index 62c8ebb31a..1d11cc1b5f 100644 }); - this.add_child(new WorkspaceIndicators()); -+ if (GLib.get_os_info('ID') === 'almalinux') { ++ if (GLib.get_os_info('ID') === 'rhel') { + const logoIcon = new St.Icon({ + icon_name: 'fedora-logo-icon', + style_class: 'activities-logo', diff --git a/gnome-shell.spec b/gnome-shell.spec index 4383fa6..1c19302 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -8,7 +8,7 @@ %endif Name: gnome-shell -Version: 47.5 +Version: 47.6 Release: %autorelease Summary: Window management and application launching for GNOME @@ -48,6 +48,9 @@ Patch: 0001-data-Update-generated-stylesheets.patch Patch: 0001-theme-Welcome-Illustration.patch %endif + +# AlmaLinux Patch +Patch: 0001-panel-Bring-the-upstream-workspace-dots-back.patch %define eds_version 3.45.1 %define gnome_desktop_version 44.0-7 %define glib2_version 2.79.2 diff --git a/sources b/sources index f7530e3..0aedf8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-47.5.tar.xz) = 5c34d16350fc92d96ed87981eea0abb9fbd9bf793085eece286b2e7bd01b94bfeb123f801e875cecadfda20abd30294e6d46aed0e1ffbbbec57bb7e0aaaea90d +SHA512 (gnome-shell-47.6.tar.xz) = 08b44959bcd014ccd1f9e753e32e70b174d4ce5bd4e8a746686a46712004bc7cd10f9c7adf0a31042d8029017f56a8a6bca72b469518e4cdacc2288872d96fac