Update to 4.9.1

.gitignore

@@ -36,3 +36,4 @@
 /gtk-4.8.0.tar.xz
 /gtk-4.8.1.tar.xz
 /gtk-4.8.2.tar.xz
+/gtk-4.9.1.tar.xz

0001-Revert-treepopover-Do-not-propagate-natural-width-of.patch

@@ -1,26 +0,0 @@
-From 339b9eb1b979fffc751cc82d1142d6231be8f0c5 Mon Sep 17 00:00:00 2001
-From: Mat <mail@mathias.is>
-Date: Wed, 26 Oct 2022 13:51:23 +0300
-Subject: [PATCH] Revert "treepopover: Do not propagate natural width of
- content"
-
-This reverts commit 9c919ffa462dd4511da0bfd19d36d2e15c51651b.
----
- gtk/gtktreepopover.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gtk/gtktreepopover.c b/gtk/gtktreepopover.c
-index 992c4574a5..ca7575a765 100644
---- a/gtk/gtktreepopover.c
-+++ b/gtk/gtktreepopover.c
-@@ -266,6 +266,7 @@ gtk_tree_popover_init (GtkTreePopover *popover)
- 
-   sw = gtk_scrolled_window_new ();
-   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+  gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (sw), TRUE);
-   gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);
-   gtk_popover_set_child (GTK_POPOVER (popover), sw);
- 
--- 
-2.37.3
-

0001-focus-fall-back-to-old-behaviour-if-we-didn-t-focus-.patch

@@ -1,34 +0,0 @@
-From 22efa03cae870dfc049b4a2d313173f8ef312a81 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Tue, 1 Nov 2022 17:26:29 -0700
-Subject: [PATCH] focus: fall back to old behaviour if we didn't focus anything
-
-8455b9ac74 seems to have introduced a problem where we can wind
-up focusing no widget at all if the `while (parent)` loop doesn't
-find a widget it can successfully move the focus to. This 'fixes'
-that by falling back to doing the previous thing if we make it
-all the way through that loop without moving the focus. Thanks to
-@coreyberla for a hint to improve the implementation.
-
-Signed-off-by: Adam Williamson <awilliam@redhat.com>
----
- gtk/gtkwindow.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index a7cbde18bc..21dfb49880 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -4703,6 +4703,9 @@ maybe_unset_focus_and_default (GtkWindow *window)
-           parent = _gtk_widget_get_parent (parent);
-         }
- 
-+      if (!parent)
-+        gtk_widget_child_focus (GTK_WIDGET (window), GTK_DIR_TAB_FORWARD);
-+
-       priv->move_focus = FALSE;
-       g_clear_object (&priv->move_focus_widget);
-     }
--- 
-2.37.3
-

gtk4.spec

@@ -2,7 +2,7 @@
 %global with_broadway 1
 %endif
 
-%global glib2_version 2.66.0
+%global glib2_version 2.72.0
 %global pango_version 1.50.0
 %global cairo_version 1.14.0
 %global gdk_pixbuf_version 2.30.0
@@ -16,28 +16,18 @@
 %global __provides_exclude_from ^%{_libdir}/gtk-4.0
 
 Name:           gtk4
-Version:        4.8.2
+Version:        4.9.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        GTK graphical user interface library
 
 License:        LGPLv2+
 URL:            https://www.gtk.org
-Source0:        https://download.gnome.org/sources/gtk/4.8/gtk-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gtk/4.9/gtk-%{version}.tar.xz
 Source1:        settings.ini
 # Temporarily revert this until we figure out how to best restore
 # private requires that are needed for rpm automatic dep extraction.
 # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756
 Patch0:         0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
-# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5189
-# https://gitlab.gnome.org/GNOME/nautilus/-/issues/2574
-# Fix a problem which could lead to no element being focused
-# (so keyboard shortcuts don't work) in some cases
-Patch1:         0001-focus-fall-back-to-old-behaviour-if-we-didn-t-focus-.patch
-# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5071
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/5192
-# Avoids app widgets potentially becoming unexpectedly narrower
-Patch2:         0001-Revert-treepopover-Do-not-propagate-natural-width-of.patch
-
 
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -249,6 +239,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_mandir}/man1/gtk4-widget-factory.1*
 
 %changelog
+* Mon Nov 21 2022 David King <amigadave@amigadave.com> - 4.9.1-1
+- Update to 4.9.1
+
 * Tue Nov 01 2022 Adam Williamson <awilliam@redhat.com> - 4.8.2-2
 - Attempt to fix a focus issue introduced in 4.8.2 (nautilus gl2574)
 - Backport MR #5091 to fix a width problem (gtk gl5192)

sources

@@ -1 +1 @@
-SHA512 (gtk-4.8.2.tar.xz) = 400cdde53a4b76a912f52b1300286b2198d47195902ccfc034fbc518be7bc4c5817fe6df6386d764c95686083eede2e4582cc555fb38b0bce455942ea6c5fcb5
+SHA512 (gtk-4.9.1.tar.xz) = 1647fe84ce722de3dd3d75fe9ad0eace7557c0dd6e7a42c1ebd911fb6f872a8cdaa7f5bb431046fc1bcc12f19dd8e8a721378c26d7e985c135dc7a7c17918499