From 9e9fad088b81aa375bbdb4286bb869337c692ce2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 6 Sep 2018 23:53:04 +0200
Subject: Backport two bugfixes from upstream

---
 gtk3.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'gtk3.spec')

diff --git a/gtk3.spec b/gtk3.spec
index a9ef91f..3e9fcf3 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -21,13 +21,17 @@
 
 Name: gtk3
 Version: 3.24.0
-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
+Patch0: 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
+Patch1: 0001-Fix-portal-path-handling.patch
+
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -161,7 +165,9 @@ The %{name}-tests package contains tests that can be used to verify
 the functionality of the installed %{name} package.
 
 %prep
-%setup -q -n gtk+-%{version}
+%autosetup -n gtk+-%{version} -p1
+# Force regeneration with patch1
+rm testsuite/gtk/gtkprivate.c
 
 %build
 export CFLAGS='-fno-strict-aliasing %optflags'
@@ -318,6 +324,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.24.0-2
+- Backport two bugfixes from upstream
+
 * Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.24.0-1
 - Update to 3.24.0
 
-- 
cgit