!11 升级到4.10.5

From: @lvgenggeng 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2023-11-28 11:20:10 +00:00 committed by Gitee
commit 8c72ffc8ff
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 6 additions and 44 deletions

View File

@ -1,34 +0,0 @@
From e07f8ef50657dab0d5184d4c6927acc0683bc07d 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.38.1

View File

@ -10,22 +10,17 @@
%global __provides_exclude_from ^%{_libdir}/gtk-4.0 %global __provides_exclude_from ^%{_libdir}/gtk-4.0
Name: gtk4 Name: gtk4
Version: 4.9.1 Version: 4.10.5
Release: 1 Release: 1
Summary: GTK graphical user interface library Summary: GTK graphical user interface library
License: LGPLv2+ License: LGPLv2+
URL: https://www.gtk.org URL: https://www.gtk.org
Source0: https://download.gnome.org/sources/gtk/4.9/gtk-%{version}.tar.xz Source0: https://download.gnome.org/sources/gtk/4.10/gtk-%{version}.tar.xz
Source1: settings.ini Source1: settings.ini
# Temporarily revert this until we figure out how to best restore # Temporarily revert this until we figure out how to best restore
# private requires that are needed for rpm automatic dep extraction. # private requires that are needed for rpm automatic dep extraction.
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756 # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756
Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch 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
BuildRequires: cups-devel desktop-file-utils docbook-style-xsl gcc BuildRequires: cups-devel desktop-file-utils docbook-style-xsl gcc
BuildRequires: sassc libxslt gcc-c++ gettext meson BuildRequires: sassc libxslt gcc-c++ gettext meson
@ -46,7 +41,6 @@ BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(pango) >= %{pango_version} BuildRequires: pkgconfig(pango) >= %{pango_version}
BuildRequires: pkgconfig(rest-1.0)
BuildRequires: pkgconfig(sysprof-4) BuildRequires: pkgconfig(sysprof-4)
BuildRequires: pkgconfig(sysprof-capture-4) BuildRequires: pkgconfig(sysprof-capture-4)
BuildRequires: pkgconfig(tracker-sparql-3.0) BuildRequires: pkgconfig(tracker-sparql-3.0)
@ -105,8 +99,7 @@ export CFLAGS='-fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT %
-Dtracker=enabled \ -Dtracker=enabled \
-Dcolord=enabled \ -Dcolord=enabled \
-Dgtk_doc=true \ -Dgtk_doc=true \
-Dman-pages=true \ -Dman-pages=true
-Dinstall-tests=false
%meson_build %meson_build
@ -192,6 +185,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/gtk4-widget-factory.1* %{_mandir}/man1/gtk4-widget-factory.1*
%changelog %changelog
* Fri Nov 17 2023 lvgenggeng <lvgenggeng@uniontech.com> - 4.10.5-1
- bump to 4.10.5-1
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 4.9.1-1 * Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 4.9.1-1
- update to 4.9.1 - update to 4.9.1