r46437 - in /desktop/unstable/gtk+3.0/debian: changelog patches/0001-Revert-stylecontext-Clear-style-property-more-freque.patch patches/git_stylecontext-make-sure-valid.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Sat Oct 10 23:21:57 2015
New Revision: 46437

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46437
Log:
* Add debian/patches/git_stylecontext-make-sure-valid.patch
  - patch from upstream git to fix crash with some themes (Closes: #800911)

Added:
    desktop/unstable/gtk+3.0/debian/patches/git_stylecontext-make-sure-valid.patch
Removed:
    desktop/unstable/gtk+3.0/debian/patches/0001-Revert-stylecontext-Clear-style-property-more-freque.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=46437&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Sat Oct 10 23:21:57 2015
@@ -1,10 +1,9 @@
-gtk+3.0 (3.18.1-2) UNRELEASED; urgency=medium
-
-  * Add d/p/0001-Revert-stylecontext-Clear-style-property-more-freque.patch
-    - temporarily revert commit causing regression while waiting for
-      upstream to comment on proper solution. (Closes: #800911)
-
- -- Andreas Henriksson <andreas at fatal.se>  Sat, 10 Oct 2015 18:10:30 +0200
+gtk+3.0 (3.18.1-2) unstable; urgency=medium
+
+  * Add debian/patches/git_stylecontext-make-sure-valid.patch
+    - patch from upstream git to fix crash with some themes (Closes: #800911)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 11 Oct 2015 01:21:46 +0200
 
 gtk+3.0 (3.18.1-1) unstable; urgency=medium
 

Added: desktop/unstable/gtk+3.0/debian/patches/git_stylecontext-make-sure-valid.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/git_stylecontext-make-sure-valid.patch?rev=46437&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/git_stylecontext-make-sure-valid.patch	(added)
+++ desktop/unstable/gtk+3.0/debian/patches/git_stylecontext-make-sure-valid.patch	[utf-8] Sat Oct 10 23:21:57 2015
@@ -0,0 +1,31 @@
+From bddc524cd84b76d1c25c7700eca9d3a25db30cf6 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at 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
+

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=46437&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Sat Oct 10 23:21:57 2015
@@ -7,4 +7,4 @@
 060_ignore-random-icons.patch
 071_fix-installation-of-HTML-images.patch
 reftest-known-fail.patch
-0001-Revert-stylecontext-Clear-style-property-more-freque.patch
+git_stylecontext-make-sure-valid.patch