AlmaLinux changes: Don’t apply the RHEL patch on AlmaLinux

This commit is contained in:
Eduard Abdullin 2026-01-21 11:52:46 +00:00 committed by root
commit b6c911a4c3
3 changed files with 55 additions and 1 deletions

View File

@ -0,0 +1,48 @@
diff --git a/gnome-initial-setup/pages/account/gis-account-page-local.ui b/gnome-initial-setup/pages/account/gis-account-page-local.ui
index 433e0490..9993e7e9 100644
--- a/gnome-initial-setup/pages/account/gis-account-page-local.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page-local.ui
@@ -27,8 +27,10 @@
<object class="GtkMenuButton" id="avatar_button">
<property name="tooltip-text" translatable="yes">Change Avatar</property>
<property name="icon-name">document-edit-symbolic</property>
+ <property name="has-frame">False</property>
<style>
<class name="circular"/>
+ <class name="avatar-button"/>
</style>
</object>
</child>
@@ -50,6 +52,7 @@
<style>
<class name="circular"/>
<class name="destructive-image-button"/>
+ <class name="no-avatar-background"/>
</style>
</object>
</child>
diff --git a/gnome-initial-setup/pages/account/gis-account-page.css b/gnome-initial-setup/pages/account/gis-account-page.css
index 59d2a3cc..77dbdeb7 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.css
+++ b/gnome-initial-setup/pages/account/gis-account-page.css
@@ -8,3 +8,20 @@
.destructive-image-button {
color: @destructive_color;
}
+
+/* Avatar button on account page should never draw a background */
+.no-avatar-background {
+ background: none;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ border: none;
+}
+
+.avatar-button > button {
+ background: none;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ border: none;
+}

View File

@ -26,8 +26,9 @@ Source2: gnome-initial-setup.sysusers.conf
%if 0%{!?almalinux}
# Downstream branding
Patch: 0001-RHEL10-style-illustrations.patch
Patch0: 0001-RHEL10-style-illustrations.patch
%endif
Patch1: 0002-account-page-disable-avatar-button-background.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc

5
rpminspect.yaml Normal file
View File

@ -0,0 +1,5 @@
---
desktop:
ignore:
- /usr/share/applications/gnome-initial-setup.desktop