import gnome-shell-40.8-3.el9

2022-03-01 06:18:08 -05:00 · 2022-03-01 06:18:08 -05:00 · a2297a586f
parent 8b751cf940
commit a2297a586f
7 changed files with 1200 additions and 106 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gnome-shell-40.7.tar.xz
+SOURCES/gnome-shell-40.8.tar.xz
--- a/.gnome-shell.metadata
+++ b/.gnome-shell.metadata
@ -1 +1 @@
-43576a70a1578fbd3711e5df641e60479463a3dd SOURCES/gnome-shell-40.7.tar.xz
+febed8f8005855b5dfb333fcb3ca0fd2e630540b SOURCES/gnome-shell-40.8.tar.xz
--- a/SOURCES/0001-Update-generated-stylesheets.patch
+++ b/SOURCES/0001-Update-generated-stylesheets.patch
@ -1,18 +1,44 @@
 From 678cdd9e0da851da78527fa827d71a80273510b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@redhat.com>
-Date: Tue, 15 Jun 2021 00:41:59 +0200
-Subject: [PATCH] Update generated stylesheets
+Date: Tue, 8 Feb 2022 14:18:04 -0500

 ---
- data/theme/gnome-shell-high-contrast.css | 7 +++++++
- data/theme/gnome-shell.css               | 7 +++++++
- 2 files changed, 14 insertions(+)
+ data/theme/gnome-shell-high-contrast.css | 36 ++++++++++++++++++++++++
+ data/theme/gnome-shell.css               | 36 ++++++++++++++++++++++++
+ 2 files changed, 72 insertions(+)

 diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
-index 64ff440..1d3e917 100644
+index b73f407..90f363c 100644
 --- a/data/theme/gnome-shell-high-contrast.css
 +++ b/data/theme/gnome-shell-high-contrast.css
-@@ -1243,6 +1243,9 @@ StScrollBar {
+@@ -1223,60 +1223,63 @@ StScrollBar {
+     -panel-corner-border-color: transparent;
+     -panel-corner-opacity: 1;
+     transition-duration: 250ms; }
+   #panel .panel-button {
+     font-weight: bold;
+     color: #ddd;
+     -natural-hpadding: 12px;
+     -minimum-hpadding: 6px;
+     transition-duration: 150ms;
+     border: 3px solid transparent;
+     border-radius: 99px; }
+     #panel .panel-button.clock-display .clock {
+       transition-duration: 150ms;
+       border: 3px solid transparent;
+       border-radius: 99px; }
+     #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
+       box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+       #panel .panel-button.clock-display:hover, #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
+         box-shadow: none; }
+         #panel .panel-button.clock-display:hover .clock, #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
+           box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+     #panel .panel-button .system-status-icon {
+       icon-size: 1.09em;
+       padding: 5px;
+       margin: 0 4px; }
+     #panel .panel-button .panel-status-indicators-box .system-status-icon,
+     #panel .panel-button .panel-status-menu-box .system-status-icon {
       margin: 0; }
     #panel .panel-button .app-menu-icon {
       -st-icon-style: symbolic; }
@ -22,7 +48,61 @@ index 64ff440..1d3e917 100644
     #panel #panelActivities.panel-button {
       -natural-hpadding: 18px; }
   #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-@@ -2060,6 +2063,10 @@ StScrollBar {
+     box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
+     #panel.unlock-screen .panel-button.clock-display:hover, #panel.unlock-screen .panel-button.clock-display:active, #panel.unlock-screen .panel-button.clock-display:overview, #panel.unlock-screen .panel-button.clock-display:focus, #panel.unlock-screen .panel-button.clock-display:checked, #panel.login-screen .panel-button.clock-display:hover, #panel.login-screen .panel-button.clock-display:active, #panel.login-screen .panel-button.clock-display:overview, #panel.login-screen .panel-button.clock-display:focus, #panel.login-screen .panel-button.clock-display:checked, #panel:overview .panel-button.clock-display:hover, #panel:overview .panel-button.clock-display:active, #panel:overview .panel-button.clock-display:overview, #panel:overview .panel-button.clock-display:focus, #panel:overview .panel-button.clock-display:checked {
+       box-shadow: none; }
+       #panel.unlock-screen .panel-button.clock-display:hover .clock, #panel.unlock-screen .panel-button.clock-display:active .clock, #panel.unlock-screen .panel-button.clock-display:overview .clock, #panel.unlock-screen .panel-button.clock-display:focus .clock, #panel.unlock-screen .panel-button.clock-display:checked .clock, #panel.login-screen .panel-button.clock-display:hover .clock, #panel.login-screen .panel-button.clock-display:active .clock, #panel.login-screen .panel-button.clock-display:overview .clock, #panel.login-screen .panel-button.clock-display:focus .clock, #panel.login-screen .panel-button.clock-display:checked .clock, #panel:overview .panel-button.clock-display:hover .clock, #panel:overview .panel-button.clock-display:active .clock, #panel:overview .panel-button.clock-display:overview .clock, #panel:overview .panel-button.clock-display:focus .clock, #panel:overview .panel-button.clock-display:checked .clock {
+         box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
+   #panel .panel-status-indicators-box,
+   #panel .panel-status-menu-box {
+     spacing: 2px; }
+   #panel .power-status.panel-status-indicators-box {
+     spacing: 0; }
+   #panel .screencast-indicator,
+   #panel .remote-access-indicator {
+     color: #f57900; }
+ 
+ #appMenu {
+   spacing: 6px; }
+   #appMenu .label-shadow {
+     color: transparent; }
+ 
+ #appMenu .panel-status-menu-box {
+   padding: 0 6px;
+   spacing: 6px; }
+ 
+ /* Activities Ripple */
+ .ripple-box {
+   background-color: rgba(158, 196, 235, 0.3);
+   box-shadow: 0 0 2px 2px #4a90d9;
+@@ -2039,74 +2042,107 @@ StScrollBar {
+     width: 2.18em;
+     height: 2.18em;
+     border-color: #202020;
+     background-color: #202020; }
+     .login-dialog .cancel-button StIcon,
+     .login-dialog .switch-user-button StIcon,
+     .login-dialog .login-dialog-session-list-button StIcon,
+     .unlock-dialog .cancel-button StIcon,
+     .unlock-dialog .switch-user-button StIcon,
+     .unlock-dialog .login-dialog-session-list-button StIcon {
+       icon-size: 1.09em; }
+   .login-dialog .caps-lock-warning-label,
+   .login-dialog .login-dialog-message-warning,
+   .unlock-dialog .caps-lock-warning-label,
+   .unlock-dialog .login-dialog-message-warning {
+     color: #eeeeec; }
+ 
+ .login-dialog-logo-bin {
+   padding: 24px 0px; }
+ 
+ .login-dialog-banner {
+   color: #d6d6d1; }
+ 
+ .login-dialog-button-box {
+   width: 23em;
+   spacing: 5px; }
+ 
 .login-dialog-message {
   text-align: center; }
 
@ -33,11 +113,108 @@ index 64ff440..1d3e917 100644
 .login-dialog-user-selection-box {
   padding: 100px 0px; }
 
+ .login-dialog-not-listed-label {
+   padding-left: 2px; }
+   .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, .login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
+     color: #eeeeec; }
+ 
+ .login-dialog-not-listed-label {
+   font-size: 10pt;
+   font-weight: bold;
+   color: #a6a69b;
+   padding-top: 1em; }
+ 
+.login-dialog-auth-list-view {
+  -st-vfade-offset: 1em; }
+
+.login-dialog-auth-list {
+  spacing: 6px;
+  margin-left: 2em; }
+
+.login-dialog-auth-list-title {
+  margin-left: 2em; }
+
+.login-dialog-auth-list-item {
+  border-radius: 12px;
+  padding: 6px;
+  color: #a6a69b; }
+  .login-dialog-auth-list-item:focus, .login-dialog-auth-list-item:selected {
+    background-color: #215d9c;
+    color: #ffffff; }
+
+.login-dialog-auth-list-label {
+  font-size: 13pt;
+  font-weight: bold;
+  padding-left: 15px; }
+  .login-dialog-auth-list-label:ltr {
+    padding-left: 14px;
+    text-align: left; }
+  .login-dialog-auth-list-label:rtl {
+    padding-right: 14px;
+    text-align: right; }
+
+ .login-dialog-user-list-view {
+   -st-vfade-offset: 1em; }
+ 
+ .login-dialog-user-list {
+   spacing: 12px;
+   width: 23em; }
+   .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
+     background-color: #215d9c;
+     color: #ffffff; }
+   .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
+     border-right: 2px solid #215d9c; }
+ 
+ .login-dialog-user-list-item {
+   border-radius: 12px;
+   padding: 6px;
+   color: #a6a69b; }
+   .login-dialog-user-list-item:ltr .user-widget {
+     padding-right: 1em; }
+   .login-dialog-user-list-item:rtl .user-widget {
+     padding-left: 1em; }
+   .login-dialog-user-list-item .login-dialog-timed-login-indicator {
+     height: 2px;
+     margin-top: 6px;
+     background-color: #eeeeec; }
+   .login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
+     background-color: #ffffff; }
+ 
+ .user-widget-label {
+   color: #eeeeec; }
+ 
 diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index 81e42ac..7320fc5 100644
+index f93819b..d3d7fc8 100644
 --- a/data/theme/gnome-shell.css
 +++ b/data/theme/gnome-shell.css
-@@ -1243,6 +1243,9 @@ StScrollBar {
+@@ -1223,60 +1223,63 @@ StScrollBar {
+     -panel-corner-border-color: transparent;
+     -panel-corner-opacity: 1;
+     transition-duration: 250ms; }
+   #panel .panel-button {
+     font-weight: bold;
+     color: #ddd;
+     -natural-hpadding: 12px;
+     -minimum-hpadding: 6px;
+     transition-duration: 150ms;
+     border: 3px solid transparent;
+     border-radius: 99px; }
+     #panel .panel-button.clock-display .clock {
+       transition-duration: 150ms;
+       border: 3px solid transparent;
+       border-radius: 99px; }
+     #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
+       box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+       #panel .panel-button.clock-display:hover, #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
+         box-shadow: none; }
+         #panel .panel-button.clock-display:hover .clock, #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
+           box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+     #panel .panel-button .system-status-icon {
+       icon-size: 1.09em;
+       padding: 5px;
+       margin: 0 4px; }
+     #panel .panel-button .panel-status-indicators-box .system-status-icon,
+     #panel .panel-button .panel-status-menu-box .system-status-icon {
       margin: 0; }
     #panel .panel-button .app-menu-icon {
       -st-icon-style: symbolic; }
@ -47,7 +224,61 @@ index 81e42ac..7320fc5 100644
     #panel #panelActivities.panel-button {
       -natural-hpadding: 18px; }
   #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
-@@ -2060,6 +2063,10 @@ StScrollBar {
+     box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
+     #panel.unlock-screen .panel-button.clock-display:hover, #panel.unlock-screen .panel-button.clock-display:active, #panel.unlock-screen .panel-button.clock-display:overview, #panel.unlock-screen .panel-button.clock-display:focus, #panel.unlock-screen .panel-button.clock-display:checked, #panel.login-screen .panel-button.clock-display:hover, #panel.login-screen .panel-button.clock-display:active, #panel.login-screen .panel-button.clock-display:overview, #panel.login-screen .panel-button.clock-display:focus, #panel.login-screen .panel-button.clock-display:checked, #panel:overview .panel-button.clock-display:hover, #panel:overview .panel-button.clock-display:active, #panel:overview .panel-button.clock-display:overview, #panel:overview .panel-button.clock-display:focus, #panel:overview .panel-button.clock-display:checked {
+       box-shadow: none; }
+       #panel.unlock-screen .panel-button.clock-display:hover .clock, #panel.unlock-screen .panel-button.clock-display:active .clock, #panel.unlock-screen .panel-button.clock-display:overview .clock, #panel.unlock-screen .panel-button.clock-display:focus .clock, #panel.unlock-screen .panel-button.clock-display:checked .clock, #panel.login-screen .panel-button.clock-display:hover .clock, #panel.login-screen .panel-button.clock-display:active .clock, #panel.login-screen .panel-button.clock-display:overview .clock, #panel.login-screen .panel-button.clock-display:focus .clock, #panel.login-screen .panel-button.clock-display:checked .clock, #panel:overview .panel-button.clock-display:hover .clock, #panel:overview .panel-button.clock-display:active .clock, #panel:overview .panel-button.clock-display:overview .clock, #panel:overview .panel-button.clock-display:focus .clock, #panel:overview .panel-button.clock-display:checked .clock {
+         box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
+   #panel .panel-status-indicators-box,
+   #panel .panel-status-menu-box {
+     spacing: 2px; }
+   #panel .power-status.panel-status-indicators-box {
+     spacing: 0; }
+   #panel .screencast-indicator,
+   #panel .remote-access-indicator {
+     color: #f57900; }
+ 
+ #appMenu {
+   spacing: 6px; }
+   #appMenu .label-shadow {
+     color: transparent; }
+ 
+ #appMenu .panel-status-menu-box {
+   padding: 0 6px;
+   spacing: 6px; }
+ 
+ /* Activities Ripple */
+ .ripple-box {
+   background-color: rgba(188, 214, 246, 0.3);
+   box-shadow: 0 0 2px 2px #629fea;
+@@ -2039,74 +2042,107 @@ StScrollBar {
+     width: 2.18em;
+     height: 2.18em;
+     border-color: #202020;
+     background-color: #202020; }
+     .login-dialog .cancel-button StIcon,
+     .login-dialog .switch-user-button StIcon,
+     .login-dialog .login-dialog-session-list-button StIcon,
+     .unlock-dialog .cancel-button StIcon,
+     .unlock-dialog .switch-user-button StIcon,
+     .unlock-dialog .login-dialog-session-list-button StIcon {
+       icon-size: 1.09em; }
+   .login-dialog .caps-lock-warning-label,
+   .login-dialog .login-dialog-message-warning,
+   .unlock-dialog .caps-lock-warning-label,
+   .unlock-dialog .login-dialog-message-warning {
+     color: #eeeeec; }
+ 
+ .login-dialog-logo-bin {
+   padding: 24px 0px; }
+ 
+ .login-dialog-banner {
+   color: #d6d6d1; }
+ 
+ .login-dialog-button-box {
+   width: 23em;
+   spacing: 5px; }
+ 
 .login-dialog-message {
   text-align: center; }
 
@ -58,6 +289,76 @@ index 81e42ac..7320fc5 100644
 .login-dialog-user-selection-box {
   padding: 100px 0px; }
 
+ .login-dialog-not-listed-label {
+   padding-left: 2px; }
+   .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, .login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
+     color: #eeeeec; }
+ 
+ .login-dialog-not-listed-label {
+   font-size: 10pt;
+   font-weight: bold;
+   color: #a6a69b;
+   padding-top: 1em; }
+ 
+.login-dialog-auth-list-view {
+  -st-vfade-offset: 1em; }
+
+.login-dialog-auth-list {
+  spacing: 6px;
+  margin-left: 2em; }
+
+.login-dialog-auth-list-title {
+  margin-left: 2em; }
+
+.login-dialog-auth-list-item {
+  border-radius: 12px;
+  padding: 6px;
+  color: #a6a69b; }
+  .login-dialog-auth-list-item:focus, .login-dialog-auth-list-item:selected {
+    background-color: #1b6acb;
+    color: #fff; }
+
+.login-dialog-auth-list-label {
+  font-size: 13pt;
+  font-weight: bold;
+  padding-left: 15px; }
+  .login-dialog-auth-list-label:ltr {
+    padding-left: 14px;
+    text-align: left; }
+  .login-dialog-auth-list-label:rtl {
+    padding-right: 14px;
+    text-align: right; }
+
+ .login-dialog-user-list-view {
+   -st-vfade-offset: 1em; }
+ 
+ .login-dialog-user-list {
+   spacing: 12px;
+   width: 23em; }
+   .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
+     background-color: #1b6acb;
+     color: #fff; }
+   .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
+     border-right: 2px solid #1b6acb; }
+ 
+ .login-dialog-user-list-item {
+   border-radius: 12px;
+   padding: 6px;
+   color: #a6a69b; }
+   .login-dialog-user-list-item:ltr .user-widget {
+     padding-right: 1em; }
+   .login-dialog-user-list-item:rtl .user-widget {
+     padding-left: 1em; }
+   .login-dialog-user-list-item .login-dialog-timed-login-indicator {
+     height: 2px;
+     margin-top: 6px;
+     background-color: #eeeeec; }
+   .login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
+     background-color: #fff; }
+ 
+ .user-widget-label {
+   color: #eeeeec; }
+ 
 -- 
-2.31.1
+2.34.1

--- a/SOURCES/0001-loginDialog-make-info-messages-themed.patch
+++ b/SOURCES/0001-loginDialog-make-info-messages-themed.patch
@ -1,4 +1,4 @@
-From cf4d6eac54e0614fe95a34a88c5c07283d49599b Mon Sep 17 00:00:00 2001
+From 4ad30b5c506ab043c2091441021b6cf334e2412f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode@redhat.com>
 Date: Mon, 26 Jun 2017 14:35:05 -0400
 Subject: [PATCH] loginDialog: make info messages themed
@ -13,7 +13,34 @@ diff --git a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss b/data/theme
 index 1789beca9..84539342d 100644
 --- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
 +++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
-@@ -93,6 +93,10 @@
+@@ -66,60 +66,64 @@
+         border-color: darken($selected_bg_color, 10%);
+         background-color: darken($selected_bg_color, 10%);
+         color: transparentize($selected_fg_color, 0.3);
+       }
+     }
+   }
+ 
+   .cancel-button,
+   .switch-user-button,
+   .login-dialog-session-list-button {
+     padding: 0;
+     border-radius: 99px;
+     width: $base_icon_size * 2;
+     height: $base_icon_size * 2;
+     border-color: darken($system_bg_color, 3%);
+     background-color: darken($system_bg_color, 3%);
+ 
+     StIcon { icon-size: $base_icon_size; }
+   }
+ 
+   .caps-lock-warning-label,
+   .login-dialog-message-warning {
+     color: $osd_fg_color;
+   }
+ }
+ 
+ .login-dialog-logo-bin { padding: 24px 0px; }
 .login-dialog-banner { color: darken($osd_fg_color,10%); }
 .login-dialog-button-box { width: 23em; spacing: 5px; }
 .login-dialog-message { text-align: center; }
@ -24,6 +51,33 @@ index 1789beca9..84539342d 100644
 .login-dialog-user-selection-box { padding: 100px 0px; }
 .login-dialog-not-listed-label {
   padding-left: 2px;
+   .login-dialog-not-listed-button:focus &,
+   .login-dialog-not-listed-button:hover & {
+     color: $osd_fg_color;
+   }
+ }
+ 
+ .login-dialog-not-listed-label {
+   @include fontsize($base_font_size - 1);
+   font-weight: bold;
+   color: darken($osd_fg_color,30%);
+   padding-top: 1em;
+ }
+ 
+ .login-dialog-user-list-view { -st-vfade-offset: 1em; }
+ .login-dialog-user-list {
+   spacing: 12px;
+   width: 23em;
+   &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
+   &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
+ }
+ 
+ .login-dialog-user-list-item {
+   border-radius: $base_border_radius + 4px;
+   padding: 6px;
+   color: darken($osd_fg_color,30%);
+   &:ltr .user-widget { padding-right: 1em; }
+   &:rtl .user-widget { padding-left: 1em; }
 -- 
-2.31.1
+2.34.1

--- a/SOURCES/0001-welcomeDialog-Adapt-dialog-title.patch
+++ b/SOURCES/0001-welcomeDialog-Adapt-dialog-title.patch
@ -1,20 +1,23 @@
-From 5033596c01e1d8fcdc9bd64a575a44f423b1ac51 Mon Sep 17 00:00:00 2001
+From 79049292451b9bb23ad92c572a438585ca37246b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
 Date: Wed, 27 Oct 2021 15:18:20 +0200
 Subject: [PATCH] welcomeDialog: Adapt dialog title

 Use RHEL branding instead of the upstream GNOME XX one.
 ---
- js/ui/welcomeDialog.js | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ js/ui/welcomeDialog.js | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)

 diff --git a/js/ui/welcomeDialog.js b/js/ui/welcomeDialog.js
-index 9d99f0035..17e2a277c 100644
+index 9d99f0035..783fd1108 100644
 --- a/js/ui/welcomeDialog.js
 +++ b/js/ui/welcomeDialog.js
-@@ -3,7 +3,6 @@
+@@ -1,9 +1,8 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ /* exported WelcomeDialog */
 
- const { Clutter, GObject, Shell, St } = imports.gi;
+-const { Clutter, GObject, Shell, St } = imports.gi;
+const { Clutter, GLib, GObject, Shell, St } = imports.gi;
 
 -const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;
@ -26,10 +29,10 @@ index 9d99f0035..17e2a277c 100644
     _buildLayout() {
 -        const [majorVersion] = Config.PACKAGE_VERSION.split('.');
 -        const title = _('Welcome to GNOME %s').format(majorVersion);
-+        const title = _('Welcome to Red Hat Enterprise Linux');
+        const title = _('Welcome to %s').format(GLib.get_os_info('NAME'));
         const description = _('If you want to learn your way around, check out the tour.');
         const content = new Dialog.MessageDialogContent({ title, description });
 
 -- 
-2.32.0
+2.33.1

--- a/SOURCES/support-choicelist-extension.patch
+++ b/SOURCES/support-choicelist-extension.patch
--- a/SPECS/gnome-shell.spec
+++ b/SPECS/gnome-shell.spec
@ -1,8 +1,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')

 Name:           gnome-shell
-Version:        40.7
-Release:        1%{?dist}
+Version:        40.8
+Release:        3%{?dist}
 Summary:        Window management and application launching for GNOME

 License:        GPLv2+
@ -254,6 +254,19 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*

 %changelog
+* Tue Feb 08 2022 Ray Strode <rstrode@redhat.com> - 40.8-3
+- Backport latest, working, version of ChoiceList extension
+- Regenerate stylesheet patch
+  Related: #1993954
+
+* Thu Jan 27 2022 Florian Müllner <fmuellner@redhat.com> - 40.8-2
+- Do not hardcode OS name in welcome dialog
+  Resolves: #2044040
+
+* Mon Jan 17 2022 Florian Müllner <fmuellner@redhat.com> - 40.8-1
+- Update to 40.8
+  Resolves: #2040061
+
 * Mon Dec 13 2021 Florian Müllner <fmuellner@redhat.com> - 40.7-1
 - Update to 40.7
  Resolves: #2031655