From 4b51d83f89783aa96cd7120c679299f387c699a3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Mar 2025 12:52:12 -0400 Subject: [PATCH] Avoid criticals on headless systems Resolve: RHEL-40884 --- ...-Avoid-criticals-on-headless-systems.patch | 30 +++++++++++++++++++ gtk3.spec | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 0001-Avoid-criticals-on-headless-systems.patch diff --git a/0001-Avoid-criticals-on-headless-systems.patch b/0001-Avoid-criticals-on-headless-systems.patch new file mode 100644 index 0000000..be139bc --- /dev/null +++ b/0001-Avoid-criticals-on-headless-systems.patch @@ -0,0 +1,30 @@ +From f22e5b0b23fcd59fc965c827b4036b212a603536 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 22 Aug 2024 11:20:17 -0400 +Subject: [PATCH] Avoid criticals on headless systems + +If we don't have a monitor, don't try to use it. +This avoids pointless critical warnings on headless systems. +--- + gtk/gtkwidget.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c +index b6e00115bb..23401a44e8 100644 +--- a/gtk/gtkwidget.c ++++ b/gtk/gtkwidget.c +@@ -10984,7 +10984,10 @@ gtk_widget_get_scale_factor (GtkWidget *widget) + display = gtk_widget_get_display (widget); + monitor = gdk_display_get_monitor (display, 0); + +- return gdk_monitor_get_scale_factor (monitor); ++ if (monitor) ++ return gdk_monitor_get_scale_factor (monitor); ++ ++ return 1; + } + + /** +-- +2.48.1 + diff --git a/gtk3.spec b/gtk3.spec index 3e3d01d..1cde729 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -28,6 +28,8 @@ URL: https://gtk.org Source0: https://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz Patch: 0001-testsuite-Stop-relying-on-xpms.patch +Patch: 0001-Avoid-criticals-on-headless-systems.patch + BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(avahi-gobject) @@ -315,6 +317,8 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || : * Mon Mar 10 2025 Matthias Clasen - 3.24.43-4 - Stop relying on xpms in the testsuite Resolves: RHEL-69453 +- Avoid criticals on headless systems + Resolves: RHEL-40884 * Tue Oct 29 2024 Troy Dawson - 3.24.43-3 - Bump release for October 2024 mass rebuild: