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/gtk4.git#f1d012984f33297825cbc1143b47747ab4af217c

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

@@ -0,0 +1,50 @@
+From 1fbdfe340ec5108a8c5a1dd1db3442aad3d2e55e Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Thu, 18 Feb 2021 16:12:53 +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/gdkdisplay-wayland.c | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
+index 41e8b5f5a7..88fab19d55 100644
+--- a/gdk/wayland/gdkdisplay-wayland.c
++++ b/gdk/wayland/gdkdisplay-wayland.c
+@@ -1590,15 +1590,11 @@ update_xft_settings (GdkDisplay *display)
+     }
+   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 (display_wayland->settings,
+                                           "org.gnome.desktop.interface");
+@@ -1622,9 +1618,6 @@ update_xft_settings (GdkDisplay *display)
+           order = GSD_FONT_RGBA_ORDER_RGB;
+         }
+ 
+-      if (schema)
+-        g_settings_schema_unref (schema);
+-
+       dpi = get_dpi_from_gsettings (display_wayland) * 1024;
+     }
+ 
+-- 
+2.29.2
+

gtk4.spec

@@ -17,13 +17,16 @@
 
 Name:           gtk4
 Version:        4.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK graphical user interface library
 
 License:        LGPLv2+
 URL:            https://www.gtk.org
 Source0:        https://download.gnome.org/sources/gtk/4.1/gtk-%{version}.tar.xz
 
+# Backported from upstream
+Patch0:         0001-gdk-wayland-Look-for-font-settings-recursively.patch
+
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl
@@ -232,6 +235,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 4.1.0-3
+- Backport upstream patch to fix a settings schema loading issue on Wayland
+
 * Mon Feb 01 2021 Kalev Lember <klember@redhat.com> - 4.1.0-2
 - Disable asserts and cast checks