Merge remote-tracking branch 'origin/master' into f32

.gitignore

@@ -186,3 +186,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-3.24.13.tar.xz
 /gtk+-3.24.14.tar.xz
 /gtk+-3.24.16.tar.xz
+/gtk+-3.24.17.tar.xz

0001-imwayland-Clamp-the-surrounding-string-end-correctly.patch

@@ -1,34 +0,0 @@
-From d7fb15c822eabe22ffda19892153d69b0f4fc2f3 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Fri, 3 Apr 2020 12:44:37 +0200
-Subject: [PATCH] imwayland: Clamp the surrounding string end correctly
-
-In the paths where len > MAX_LEN and cursor/anchor are separated by
-at least MAX_LEN from text edges, we were clamping the right end of
-the surrounding string at MAX_LEN. Oops.
-
-This end anchor may go as far as the string length, although just
-up to len - MAX_LEN in real terms (due to the condition above that
-caches cursor/anchor positions being near enough the text end).
-
-Closes: https://gitlab.gnome.org/GNOME/gtk/-/issues/2565
----
- modules/input/imwayland.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
-index 8f697bec1b..12d18a0f64 100644
---- a/modules/input/imwayland.c
-+++ b/modules/input/imwayland.c
-@@ -322,7 +322,7 @@ notify_surrounding_text (GtkIMContextWayland *context)
-           mid = MIN (context->surrounding.cursor_idx,
-                      context->surrounding.anchor_idx) + (cursor_len / 2);
-           a = MAX (0, mid - (MAX_LEN / 2));
--          b = MIN (MAX_LEN, mid + (MAX_LEN / 2));
-+          b = MIN (len, mid + (MAX_LEN / 2));
- 
-           start = &context->surrounding.text[a];
-           end = &context->surrounding.text[b];
--- 
-2.25.2
-

gtk3.spec

@@ -24,16 +24,14 @@
 %global __provides_exclude_from ^%{_libdir}/gtk-3.0
 
 Name: gtk3
-Version: 3.24.16
+Version: 3.24.17
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: GTK+ graphical user interface library
 
 License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz
 
-Patch1: 0001-imwayland-Clamp-the-surrounding-string-end-correctly.patch
-
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -328,6 +326,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
 %{_datadir}/installed-tests/
 
 %changelog
+* Fri Apr 03 2020 Kalev Lember <klember@redhat.com> - 3.24.17-1
+- Update to 3.24.17
+
 * Fri Apr 03 2020 Kalev Lember <klember@redhat.com> - 3.24.16-2
 - Backport upstream fixes for an imwayland crash
 

sources

@@ -1 +1 @@
-SHA512 (gtk+-3.24.16.tar.xz) = 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb
+SHA512 (gtk+-3.24.17.tar.xz) = 42a0f8c3d64f9354f3954a8ecd8955abcf23cac4b9f433daef153b77c2e3abfbdd16231432bf6907d86c57e33d0f22c771685cb83b299a0883dfd3245372df1e