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