Refresh patches.

This commit is contained in:
Michael Biebl
2015-10-13 19:43:05 +00:00
parent f56a1fe32e
commit 317fc80fc1
5 changed files with 9 additions and 40 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
gtk+3.0 (3.18.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Refresh patches.
-- Michael Biebl <biebl@debian.org> Tue, 13 Oct 2015 21:39:35 +0200

View File

@ -3,11 +3,11 @@ Author: Cody Russell <bratsche@gnome.org>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
Index: gtk+-3.18.1/gtk/gtkmain.c
Index: gtk+-3.18.2/gtk/gtkmain.c
===================================================================
--- gtk+-3.18.1.orig/gtk/gtkmain.c 2015-10-08 00:19:28.186001985 +0200
+++ gtk+-3.18.1/gtk/gtkmain.c 2015-10-08 00:19:28.182001929 +0200
@@ -2157,9 +2157,14 @@
--- gtk+-3.18.2.orig/gtk/gtkmain.c 2015-10-13 21:40:57.143828925 +0200
+++ gtk+-3.18.2/gtk/gtkmain.c 2015-10-13 21:40:57.139828869 +0200
@@ -2163,9 +2163,14 @@
{
GtkWindowGroup *group;
GtkWidget *old_grab_widget;

View File

@ -3,11 +3,11 @@ Author: Robert Carr <racarr@canonical.com>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
Bug-Ubuntu: https://launchpad.net/bugs/804009
Index: gtk+-3.18.1/gtk/gtkmain.c
Index: gtk+-3.18.2/gtk/gtkmain.c
===================================================================
--- gtk+-3.18.1.orig/gtk/gtkmain.c 2015-10-08 00:19:30.634035933 +0200
+++ gtk+-3.18.1/gtk/gtkmain.c 2015-10-08 00:19:30.630035878 +0200
@@ -2250,9 +2250,14 @@
--- gtk+-3.18.2.orig/gtk/gtkmain.c 2015-10-13 21:41:02.115896913 +0200
+++ gtk+-3.18.2/gtk/gtkmain.c 2015-10-13 21:41:02.111896858 +0200
@@ -2256,9 +2256,14 @@
{
GtkWindowGroup *group;
GtkWidget *old_grab_widget;

View File

@ -1,31 +0,0 @@
From bddc524cd84b76d1c25c7700eca9d3a25db30cf6 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 10 Oct 2015 23:21:45 +0200
Subject: stylecontext: Make sure style is valid when looking up style
properties
Otherwise, the validation may happen vey automatically some time during
the style property and that will most likely cause a crash.
https://bugzilla.gnome.org/show_bug.cgi?id=756338
---
gtk/gtkstylecontext.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 0217d55..5d059a0 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1557,6 +1557,9 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
priv = context->priv;
+ /* ensure the style cache is valid by forcing a validation */
+ gtk_style_context_lookup_style (context);
+
key.widget_type = widget_type;
key.pspec = pspec;
--
cgit v0.11.2

View File

@ -7,4 +7,3 @@
060_ignore-random-icons.patch
071_fix-installation-of-HTML-images.patch
reftest-known-fail.patch
git_stylecontext-make-sure-valid.patch