Avoid assert when headless

Resolves: RHEL-110674
This commit is contained in:
Jonas Ådahl 2026-05-18 10:50:02 +02:00
parent 42b684ecd5
commit 77ff09ab18
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 552c8cfc0d96f5711dff98327e07ded506a7ecfc Mon Sep 17 00:00:00 2001
From: Joan Torres <joan.torres@suse.com>
Date: Mon, 18 Dec 2023 18:33:16 +0100
Subject: [PATCH] clutter/actor: Set a minimum guessed scale
When running headlessly it fails guessing the scale to -1.0f making
the assertion g_assert (guessed_scale >= 0.5) fail.
Setting it to 1.f in that case fixes it.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3464>
(cherry picked from commit 3a94822e755e530b71c33bb5bce0e8faa438983c)
---
clutter/clutter/clutter-actor.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 64cf291f8b..5a6a009303 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -15725,6 +15725,9 @@ clutter_actor_get_real_resource_scale (ClutterActor *self)
max_scale = MAX (clutter_stage_view_get_scale (view), max_scale);
}
+ if (max_scale < 0.f)
+ max_scale = 1.f;
+
guessed_scale = max_scale;
}
else
--
2.54.0

View File

@ -10,7 +10,7 @@
Name: mutter
Version: 40.9
Release: 32%{?dist}
Release: 33%{?dist}
Summary: Window and compositing manager based on Clutter
License: GPLv2+
@ -196,6 +196,9 @@ Patch533: 0001-x11-iconcache-Turn-icons-from-WM_HINTS-pixmaps-to-ca.patch
# RHEL-68825
Patch534: 0001-workspace-Sanity-check-input-to-activate.patch
# Avoid assert when headless (RHEL-110674)
Patch535: 0001-clutter-actor-Set-a-minimum-guessed-scale.patch
BuildRequires: chrpath
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
@ -343,6 +346,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_datadir}/mutter-%{mutter_api_version}/tests
%changelog
* Mon May 18 2026 Jonas Ådahl <jadahl@redhat.com> - 40.9-33
- Avoid assert when headless
Resolves: RHEL-110674
* Thu Nov 27 2025 Jonas Ådahl <jadahl@redhat.com> - 40.9-32
- Sanity check input on workspace activation API
Related: RHEL-68825