From 3d78934b161d7801a193e08c6d94227ff0075963 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 15 Feb 2021 21:59:55 +0100
Subject: Backport upstream patches to fix regressions in Compose file parsing

---
 gtk3.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'gtk3.spec')

diff --git a/gtk3.spec b/gtk3.spec
index b9b49fe..ec53c78 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -25,13 +25,17 @@
 
 Name: gtk3
 Version: 3.24.25
-Release: 1%{?dist}
+Release: 2%{?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
 
+# Backported from upstream
+Patch1: 0001-imcontext-Fix-a-regression-in-Compose-file-parsing.patch
+Patch2: 0002-imcontext-Be-more-lenient-in-parsing-Compose.patch
+
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -326,6 +330,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
 %{_datadir}/installed-tests/
 
 %changelog
+* Mon Feb 15 2021 Kalev Lember <klember@redhat.com> - 3.24.25-2
+- Backport upstream patches to fix regressions in Compose file parsing
+
 * Fri Feb 12 2021 Kalev Lember <klember@redhat.com> - 3.24.25-1
 - Update to 3.24.25
 
-- 
cgit