AlmaLinux changes: Use AlmaLinux icon as activities button

Use unbranded illustrations

Fix Firefox desktop filename in favorites
This commit is contained in:
Eduard Abdullin 2025-08-29 01:44:27 +00:00 committed by root
commit 23f5de3a00
5 changed files with 34 additions and 65 deletions

1
.gitignore vendored
View File

@ -239,3 +239,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-47.6.tar.xz
/gnome-shell-47.7.tar.xz
/gnome-shell-47.8.tar.xz
/gnome-shell-47.9.tar.xz

View File

@ -0,0 +1,27 @@
From 0bdde770a36e0c43b7f2ff580aa80cb6ef1583da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 27 Aug 2025 13:25:01 +0200
Subject: [PATCH] Revert "Require gjs >= 1.81.2 for build because
Intl.Segmenter is needed"
This reverts commit 9ce0cf036e4b22b6933e5425a0604fd0135d8b31.
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index aed3f89611..10428ea96f 100644
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@ eds_req = '>= 3.33.1'
gcr_req = '>= 3.90.0'
gio_req = '>= 2.79.2'
gi_req = '>= 1.49.1'
-gjs_req = '>= 1.81.2'
+gjs_req = '>= 1.73.1'
gtk_req = '>= 4.0'
mutter_req = '>= 47.0'
polkit_req = '>= 0.100'
--
2.50.1

View File

@ -8,7 +8,7 @@
%endif
Name: gnome-shell
Version: 47.8
Version: 47.9
Release: %autorelease
Summary: Window management and application launching for GNOME
@ -50,6 +50,7 @@ Patch: 0001-theme-Welcome-Illustration.patch
%endif
Patch: screenshot-tool.patch
Patch: 0001-Revert-status-keyboard-Limit-the-input-method-indica.patch
Patch: 0001-Revert-Require-gjs-1.81.2-for-build-because-Intl.Seg.patch
# AlmaLinux Patch
Patch: 0001-panel-Bring-the-upstream-workspace-dots-back.patch

View File

@ -1,67 +1,7 @@
From c51ee10056e148e7eec74f3b67f3e5168373b563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sat, 19 Jul 2025 14:12:46 +0200
Subject: [PATCH 1/2] screenshot: Fix taking interactive screenshots via D-Bus
The D-Bus method relies on the `screenshot-taken` and `closed` signals
to differentiate successful operations from canceled/failed ones.
However as the `screenshot-taken` signal is emitted asynchronously,
it may end up being emitted after the `closed` signal even in case
of success. Await the result to ensure correct ordering.
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8499
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3803>
---
js/ui/screenshot.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 762848c287..962459214f 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -1350,7 +1350,7 @@ export const ScreenshotUI = GObject.registerClass({
visible: false,
}));
this._captureButton.connect('clicked',
- this._onCaptureButtonClicked.bind(this));
+ () => this._onCaptureButtonClicked().catch(logError));
this._bottomRowContainer.add_child(this._captureButton);
this._showPointerButtonContainer = new St.BoxLayout({
@@ -1872,9 +1872,13 @@ export const ScreenshotUI = GObject.registerClass({
return [x, y, w, h];
}
- _onCaptureButtonClicked() {
+ async _onCaptureButtonClicked() {
if (this._shotButton.checked) {
- this._saveScreenshot().catch(logError);
+ try {
+ await this._saveScreenshot();
+ } catch (e) {
+ logError(e);
+ }
this.close();
} else {
// Screencast closes the UI on its own.
@@ -2139,7 +2143,7 @@ export const ScreenshotUI = GObject.registerClass({
symbol === Clutter.KEY_KP_Enter || symbol === Clutter.KEY_ISO_Enter ||
((event.get_state() & Clutter.ModifierType.CONTROL_MASK) &&
(symbol === Clutter.KEY_c || symbol === Clutter.KEY_C))) {
- this._onCaptureButtonClicked();
+ this._onCaptureButtonClicked().catch(logError);
return Clutter.EVENT_STOP;
}
--
2.50.1
From f61170d09c728144ecf9c44b4b0a0392237fadd6 Mon Sep 17 00:00:00 2001
From b1580fc69a8417b45367ed3a2dbd946f270ac683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 18 Jul 2025 21:34:36 +0200
Subject: [PATCH 2/2] Add screenshot CLI tool
Subject: [PATCH] Add screenshot CLI tool
The tool provides the same API as gnome-screenshot, but leverages
GNOME's built-in screenshot UI instead of implementing its own
@ -160,7 +100,7 @@ index c61bf51513..cfb9c8e07f 100644
+ )
+endforeach
diff --git a/meson.build b/meson.build
index 6f10a366bf..14b793db6a 100644
index 561ab30832..aed3f89611 100644
--- a/meson.build
+++ b/meson.build
@@ -134,6 +134,8 @@ if get_option('man')

View File

@ -1 +1 @@
SHA512 (gnome-shell-47.8.tar.xz) = 7fd25adbb698d239e1ae75f0caa0ef8198a152b4b859dcc23c4d63972a1629ca56c286d380211a0b4431c7b506bccf4edb6c9c1a1d899509d1a585eea4693acb
SHA512 (gnome-shell-47.9.tar.xz) = b97aa93a332b37f2f5c5a9a2aa2f66cb25a63d518bf023932f12d581f84e7259fa22577ab7da0e8d7517bbd0b6bb40a85a21c8d83b6a22d435c0d32894b77c2f