Update to 3.22.25

This commit is contained in:
Kalev Lember 2017-11-01 19:56:59 +01:00
parent 571510f959
commit 785a9d6b74
4 changed files with 7 additions and 49 deletions

1
.gitignore vendored
View File

@ -165,3 +165,4 @@ gtk+-2.90.5.tar.bz2
/gtk+-3.22.20.tar.xz
/gtk+-3.22.21.tar.xz
/gtk+-3.22.24.tar.xz
/gtk+-3.22.25.tar.xz

View File

@ -1,42 +0,0 @@
From 7c2ff0449adfef596d7eea86b51f2ee40c52ad08 Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <azzaronea@gmail.com>
Date: Wed, 18 Oct 2017 12:35:04 +0200
Subject: [PATCH] gdk: Clear GL context when window is withdrawn
Some clients (e.g. gnome-online-accounts) quickly unmap and map
a window. With some backends the backend surface will be replaced
causing the application to crash because the GL context is still
using the old surface. Clearing the GL context when a window is
withdrawn fixes this.
https://bugzilla.gnome.org/show_bug.cgi?id=789141
---
gdk/gdkwindow.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c0e0a7d4b2b7..79804cdacdac 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -5744,6 +5744,7 @@ gdk_window_withdraw (GdkWindow *window)
{
GdkWindowImplClass *impl_class;
gboolean was_mapped;
+ GdkGLContext *current_context;
g_return_if_fail (GDK_IS_WINDOW (window));
@@ -5768,6 +5769,10 @@ gdk_window_withdraw (GdkWindow *window)
_gdk_synthesize_crossing_events_for_geometry_change (window->parent);
}
+ current_context = gdk_gl_context_get_current ();
+ if (current_context != NULL && gdk_gl_context_get_window (current_context) == window)
+ gdk_gl_context_clear_current ();
+
recompute_visible_regions (window, FALSE);
gdk_window_clear_old_updated_area (window);
}
--
2.14.2

View File

@ -21,17 +21,14 @@
%global __provides_exclude_from ^%{_libdir}/gtk-3.0
Name: gtk3
Version: 3.22.24
Release: 3%{?dist}
Version: 3.22.25
Release: 1%{?dist}
Summary: GTK+ graphical user interface library
License: LGPLv2+
URL: http://www.gtk.org
Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=789141
Patch0: gtk3-gdk-Clear-GL-context-when-window-is-withdrawn.patch
BuildRequires: pkgconfig(atk) >= %{atk_version}
BuildRequires: pkgconfig(atk-bridge-2.0)
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -170,7 +167,6 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n gtk+-%{version}
%patch0 -p1
%build
export CFLAGS='-fno-strict-aliasing %optflags'
@ -344,6 +340,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
%{_datadir}/installed-tests
%changelog
* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 3.22.25-1
- Update to 3.22.25
* Wed Oct 25 2017 Debarshi Ray <rishi@fedoraproject.org> - 3.22.24-3
- Backport fix to prevent crashes when adding online accounts (GNOME #789141)

View File

@ -1 +1 @@
SHA512 (gtk+-3.22.24.tar.xz) = fd2f9b99c48581cd0eabdce2593293360e4ee1ffe40ab66237289ad08053a553dbe499115036b81051c0db77423805e232ed4a19490c6b1d790a5185cc193169
SHA512 (gtk+-3.22.25.tar.xz) = ecb74f9a32a678e6c963a5f145c02672e26a9461cd79625f1a590b8817e8c83ec5aaa79b2d52138c6919d095929073311efe2abe451e8cb981ca54b9b234cd49