components/gnome/gtk3/patches/02-stylecontext.patch
changeset 6970 e93a6290ba5f
equal deleted inserted replaced
6969:c033ca9bd950 6970:e93a6290ba5f
       
     1 Patch from upstream git repo that happens to also solve
       
     2 Bug 24711806 - meld bus error on SPARC in S12 build #106
       
     3 
       
     4 From a11de0da6b4fcc59c752c981921f268dee78e7db Mon Sep 17 00:00:00 2001
       
     5 From: Benjamin Otte <[email protected]>
       
     6 Date: Tue, 15 Dec 2015 16:03:25 +0100
       
     7 Subject: [PATCH] stylecontext: Builtin images can be (and are) transformed
       
     8 
       
     9 So don't special-case them out.
       
    10 ---
       
    11  gtk/gtkstylecontext.c | 5 -----
       
    12  1 file changed, 5 deletions(-)
       
    13 
       
    14 diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
       
    15 index 7e8c2a0..65ebe68 100644
       
    16 --- a/gtk/gtkstylecontext.c
       
    17 +++ b/gtk/gtkstylecontext.c
       
    18 @@ -28,7 +28,6 @@
       
    19  #include "gtkcsscolorvalueprivate.h"
       
    20  #include "gtkcsscornervalueprivate.h"
       
    21  #include "gtkcssenumvalueprivate.h"
       
    22 -#include "gtkcssimagebuiltinprivate.h"
       
    23  #include "gtkcssimagevalueprivate.h"
       
    24  #include "gtkcssnodedeclarationprivate.h"
       
    25  #include "gtkcssnodeprivate.h"
       
    26 @@ -3091,10 +3090,6 @@ _gtk_style_context_get_icon_extents (GtkStyleContext *context,
       
    27    extents->width = width;
       
    28    extents->height = height;
       
    29  
       
    30 -  /* builtin images can't be transformed */
       
    31 -  if (GTK_IS_CSS_IMAGE_BUILTIN (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)))
       
    32 -    return;
       
    33 -
       
    34    if (!_gtk_css_transform_value_get_matrix (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_TRANSFORM), &transform_matrix))
       
    35      return;
       
    36    
       
    37 -- 
       
    38 2.7.4
       
    39