Backport changes from F34
- update to 40.6 - work around crashy tear downs Resolves: #2008065
This commit is contained in:
parent
c69e063145
commit
98464700dc
1
.gitignore
vendored
1
.gitignore
vendored
@ -195,3 +195,4 @@ gnome-shell-2.31.5.tar.bz2
|
|||||||
/gnome-shell-40.2.tar.xz
|
/gnome-shell-40.2.tar.xz
|
||||||
/gnome-shell-40.3.tar.xz
|
/gnome-shell-40.3.tar.xz
|
||||||
/gnome-shell-40.4.tar.xz
|
/gnome-shell-40.4.tar.xz
|
||||||
|
/gnome-shell-40.6.tar.xz
|
||||||
|
31
0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
Normal file
31
0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From a9e79b1657dc7c1b702d7acc4d322539d2b8b6aa Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||||
|
Date: Wed, 6 Oct 2021 10:00:43 +0200
|
||||||
|
Subject: [PATCH] main: Leak the GJS context and ShellGlobal
|
||||||
|
|
||||||
|
There are many crash-on-exit happening as a side effect of destroying
|
||||||
|
the GJS context. Work around these until we have a better solution by
|
||||||
|
leaking them.
|
||||||
|
---
|
||||||
|
src/main.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/main.c b/src/main.c
|
||||||
|
index 91e5493fd1..d62dda9627 100644
|
||||||
|
--- a/src/main.c
|
||||||
|
+++ b/src/main.c
|
||||||
|
@@ -508,9 +508,11 @@ main (int argc, char **argv)
|
||||||
|
ecode = meta_run ();
|
||||||
|
shell_profiler_shutdown ();
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
g_debug ("Doing final cleanup");
|
||||||
|
_shell_global_destroy_gjs_context (shell_global_get ());
|
||||||
|
g_object_unref (shell_global_get ());
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
return ecode;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From c0884932df4799cc0c366d847a493e935f6bb83a Mon Sep 17 00:00:00 2001
|
From 5033596c01e1d8fcdc9bd64a575a44f423b1ac51 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||||
Date: Wed, 27 Oct 2021 15:18:20 +0200
|
Date: Wed, 27 Oct 2021 15:18:20 +0200
|
||||||
Subject: [PATCH] welcomeDialog: Adapt dialog title
|
Subject: [PATCH] welcomeDialog: Adapt dialog title
|
||||||
@ -9,7 +9,7 @@ Use RHEL branding instead of the upstream GNOME XX one.
|
|||||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/js/ui/welcomeDialog.js b/js/ui/welcomeDialog.js
|
diff --git a/js/ui/welcomeDialog.js b/js/ui/welcomeDialog.js
|
||||||
index cf6540fe2..17e2a277c 100644
|
index 9d99f0035..17e2a277c 100644
|
||||||
--- a/js/ui/welcomeDialog.js
|
--- a/js/ui/welcomeDialog.js
|
||||||
+++ b/js/ui/welcomeDialog.js
|
+++ b/js/ui/welcomeDialog.js
|
||||||
@@ -3,7 +3,6 @@
|
@@ -3,7 +3,6 @@
|
||||||
@ -25,7 +25,7 @@ index cf6540fe2..17e2a277c 100644
|
|||||||
|
|
||||||
_buildLayout() {
|
_buildLayout() {
|
||||||
- const [majorVersion] = Config.PACKAGE_VERSION.split('.');
|
- const [majorVersion] = Config.PACKAGE_VERSION.split('.');
|
||||||
- const title = _('Welcome to GNOME %s'.format(majorVersion));
|
- const title = _('Welcome to GNOME %s').format(majorVersion);
|
||||||
+ const title = _('Welcome to Red Hat Enterprise Linux');
|
+ const title = _('Welcome to Red Hat Enterprise Linux');
|
||||||
const description = _('If you want to learn your way around, check out the tour.');
|
const description = _('If you want to learn your way around, check out the tour.');
|
||||||
const content = new Dialog.MessageDialogContent({ title, description });
|
const content = new Dialog.MessageDialogContent({ title, description });
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||||
|
|
||||||
Name: gnome-shell
|
Name: gnome-shell
|
||||||
Version: 40.4
|
Version: 40.6
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Window management and application launching for GNOME
|
Summary: Window management and application launching for GNOME
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -35,6 +35,7 @@ Patch37: 0001-Update-generated-stylesheets.patch
|
|||||||
Patch38: add-power-profiles-menu.patch
|
Patch38: add-power-profiles-menu.patch
|
||||||
Patch39: 0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch
|
Patch39: 0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch
|
||||||
Patch40: 0001-welcomeDialog-Adapt-dialog-title.patch
|
Patch40: 0001-welcomeDialog-Adapt-dialog-title.patch
|
||||||
|
Patch41: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
|
||||||
|
|
||||||
%define eds_version 3.33.1
|
%define eds_version 3.33.1
|
||||||
%define gnome_desktop_version 3.35.91
|
%define gnome_desktop_version 3.35.91
|
||||||
@ -253,6 +254,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
|
|||||||
%{_mandir}/man1/gnome-shell.1*
|
%{_mandir}/man1/gnome-shell.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 04 2021 Florian Müllner <fmuellner@redhat.com> - 40.6-1
|
||||||
|
- Update to 40.6
|
||||||
|
- Work around crashy tear down
|
||||||
|
Resolves: #2008065
|
||||||
|
|
||||||
* Wed Oct 27 2021 Florian Müllner <fmuellner@redhat.com> - 40.4-5
|
* Wed Oct 27 2021 Florian Müllner <fmuellner@redhat.com> - 40.4-5
|
||||||
- Adapt welcome dialog title
|
- Adapt welcome dialog title
|
||||||
Resolves: #2013989
|
Resolves: #2013989
|
||||||
|
3
sources
3
sources
@ -1,2 +1 @@
|
|||||||
SHA512 (gnome-shell-40.3.tar.xz) = 05d47e1b0f8ec27f0ae7564476012f21dcb2ec8e6da61a589b7fe17df1a23035cb6e261805250a410737502b9bdbb25f56432a618de88881d7e15b6432e52770
|
SHA512 (gnome-shell-40.6.tar.xz) = 04e4e0b87f32283bd40a7264b27bab4ef8ce213ee33a868001d4f7fb40e3bc1a96e04f83a0321ce76558fb89c2dbb35cb1b371831f3ddc5f72f21f54138a73ec
|
||||||
SHA512 (gnome-shell-40.4.tar.xz) = 305d12cc7273f23e4a0c294f532cbf951816fd2de81959bef769048f4d5717e9e1886b64fe17b2f5ef6ee216ea67a6b913293a8903ec5dc5214bd29fbb1d3b32
|
|
||||||
|
Loading…
Reference in New Issue
Block a user