Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gtk3.git#8e6f224a4a689d083a33ac106b57a6b914acaacb

0001-gdk-wayland-Look-for-font-settings-recursively.patch

@@ -0,0 +1,40 @@
+From 4d30400987d013b410bdff33f92bf67e2b814aa9 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Thu, 18 Feb 2021 16:26:50 +0100
+Subject: [PATCH] gdk/wayland: Look for font settings recursively
+
+Use the infrastructure already available to look up keys, instead.
+This does the right thing and looks up the setting across all
+sources.
+
+Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/3680
+---
+ gdk/wayland/gdkscreen-wayland.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
+index e52f9171c7..084c1e3d19 100644
+--- a/gdk/wayland/gdkscreen-wayland.c
++++ b/gdk/wayland/gdkscreen-wayland.c
+@@ -380,15 +380,11 @@ update_xft_settings (GdkScreen *screen)
+     }
+   else
+     {
+-      GSettingsSchemaSource *source;
+-      GSettingsSchema *schema;
++      TranslationEntry *entry;
+ 
+-      source = g_settings_schema_source_get_default ();
+-      schema = g_settings_schema_source_lookup (source,
+-                                                "org.gnome.desktop.interface",
+-                                                FALSE);
++      entry = find_translation_entry_by_schema ("org.gnome.desktop.interface", "font-antialiasing");
+ 
+-      if (schema && g_settings_schema_has_key (schema, "font-antialiasing"))
++      if (entry && entry->valid)
+         {
+           settings = g_hash_table_lookup (screen_wayland->settings,
+                                           "org.gnome.desktop.interface");
+-- 
+2.29.2
+

gtk3.spec

@@ -19,7 +19,7 @@
 
 Name: gtk3
 Version: 3.24.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: GTK+ graphical user interface library
 
 License: LGPLv2+
@@ -30,6 +30,7 @@ Source0: http://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz
 Patch1: 0001-imcontext-Fix-a-regression-in-Compose-file-parsing.patch
 Patch2: 0002-imcontext-Be-more-lenient-in-parsing-Compose.patch
 Patch3: 0003-Adwaita-Scrollbar-transitions-and-size.patch
+Patch4: 0001-gdk-wayland-Look-for-font-settings-recursively.patch
 
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
@@ -324,6 +325,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
 %{_datadir}/installed-tests/
 
 %changelog
+* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 3.24.25-3
+- Backport upstream patch to fix a settings schema loading issue on Wayland
+
 * Mon Feb 15 2021 Kalev Lember <klember@redhat.com> - 3.24.25-2
 - Backport upstream patches to fix regressions in Compose file parsing
 - Backport upstream patch to further tweak scrollbar transitions and size