Stop relying on xpms in the testsuite

Resolves: RHEL-69453
This commit is contained in:
Matthias Clasen 2025-03-10 12:48:08 -04:00
parent f6d5a1e3b2
commit 07aecb24a7
3 changed files with 100 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 15 Jun 2024 14:18:01 -0400
Subject: [PATCH] Stop looking for modules in cwd
This is just not a good idea. It is surprising, and can be misused.
Fixes: #6786
---
gtk/gtkmodules.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 704e412aeb..f93101c272 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -214,13 +214,8 @@ find_module (const gchar *name)
gchar *module_name;
module_name = _gtk_find_module (name, "modules");
- if (!module_name)
- {
- /* As last resort, try loading without an absolute path (using system
- * library path)
- */
- module_name = g_module_build_path (NULL, name);
- }
+ if (module_name == NULL)
+ return NULL;
module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
--
2.45.2

View File

@ -0,0 +1,59 @@
From fd803f19de47513057869d5e2853f805f2bf4ddc Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 28 Feb 2025 14:42:06 -0500
Subject: [PATCH] testsuite: Stop relying on xpms
gdk-pixbuf isn't loading those anymore, by default.
---
testsuite/gtk/textbuffer.c | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/testsuite/gtk/textbuffer.c b/testsuite/gtk/textbuffer.c
index f7b2651c6b..1a9c079197 100644
--- a/testsuite/gtk/textbuffer.c
+++ b/testsuite/gtk/textbuffer.c
@@ -603,32 +603,6 @@ run_tests (GtkTextBuffer *buffer)
check_specific_tag (buffer, "end_tag");
}
-
-static const char *book_closed_xpm[] = {
-"16 16 6 1",
-" c None s None",
-". c black",
-"X c red",
-"o c yellow",
-"O c #808080",
-"# c white",
-" ",
-" .. ",
-" ..XX. ",
-" ..XXXXX. ",
-" ..XXXXXXXX. ",
-".ooXXXXXXXXX. ",
-"..ooXXXXXXXXX. ",
-".X.ooXXXXXXXXX. ",
-".XX.ooXXXXXX.. ",
-" .XX.ooXXX..#O ",
-" .XX.oo..##OO. ",
-" .XX..##OO.. ",
-" .X.#OO.. ",
-" ..O.. ",
-" .. ",
-" "};
-
static void
fill_buffer (GtkTextBuffer *buffer)
{
@@ -674,7 +648,7 @@ fill_buffer (GtkTextBuffer *buffer)
"font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
NULL);
- pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
+ pixbuf = gdk_pixbuf_new_from_resource ("/org/gtk/libgtk/icons/16x16/actions/application-exit.png", NULL);
g_assert (pixbuf != NULL);
--
2.48.1

View File

@ -20,13 +20,14 @@
Name: gtk3
Version: 3.24.43
Release: 3%{?dist}
Release: 4%{?dist}
Summary: GTK+ graphical user interface library
License: LGPL-2.0-or-later
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
BuildRequires: pkgconfig(atk) >= %{atk_version}
BuildRequires: pkgconfig(atk-bridge-2.0)
BuildRequires: pkgconfig(avahi-gobject)
@ -311,6 +312,10 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
%{_datadir}/installed-tests/
%changelog
* Mon Mar 10 2025 Matthias Clasen <mclasen@redhat.com> - 3.24.43-4
- Stop relying on xpms in the testsuite
Resolves: RHEL-69453
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.24.43-3
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018