diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch new file mode 100644 index 0000000000..237f803755 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | From 4d09ff324419fe4e671233044e424378da53969b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 9 Jun 2015 14:20:30 +0300 | ||
4 | Subject: [PATCH] Remove Gdk-dependency from gtk-encode-symbolic-svg | ||
5 | |||
6 | Building gtk-encode-symbolic-svg without building Gdk is useful | ||
7 | as only the icon tools are needed on the native build: this makes | ||
8 | native build much faster and requires much less dependencies. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | --- | ||
14 | gtk/encodesymbolic.c | 36 ++++++++++-------------------------- | ||
15 | 1 file changed, 10 insertions(+), 26 deletions(-) | ||
16 | |||
17 | diff --git a/gtk/encodesymbolic.c b/gtk/encodesymbolic.c | ||
18 | index 9f7d015..1f07563 100644 | ||
19 | --- a/gtk/encodesymbolic.c | ||
20 | +++ b/gtk/encodesymbolic.c | ||
21 | @@ -19,7 +19,6 @@ | ||
22 | |||
23 | #include <glib.h> | ||
24 | #include <gdk-pixbuf/gdk-pixdata.h> | ||
25 | -#include <gdk/gdk.h> | ||
26 | #include <glib/gi18n.h> | ||
27 | |||
28 | #ifdef HAVE_UNISTD_H | ||
29 | @@ -43,30 +42,18 @@ static GdkPixbuf * | ||
30 | load_symbolic_svg (char *file_data, gsize file_len, | ||
31 | int width, | ||
32 | int height, | ||
33 | - const GdkRGBA *fg, | ||
34 | - const GdkRGBA *success_color, | ||
35 | - const GdkRGBA *warning_color, | ||
36 | - const GdkRGBA *error_color, | ||
37 | + const char *css_fg, | ||
38 | + const char *css_success, | ||
39 | + const char *css_warning, | ||
40 | + const char *css_error, | ||
41 | GError **error) | ||
42 | { | ||
43 | GInputStream *stream; | ||
44 | GdkPixbuf *pixbuf; | ||
45 | - gchar *css_fg; | ||
46 | - gchar *css_success; | ||
47 | - gchar *css_warning; | ||
48 | - gchar *css_error; | ||
49 | gchar *data; | ||
50 | gchar *svg_width, *svg_height; | ||
51 | gchar *escaped_file_data; | ||
52 | |||
53 | - css_fg = gdk_rgba_to_string (fg); | ||
54 | - | ||
55 | - css_success = css_warning = css_error = NULL; | ||
56 | - | ||
57 | - css_warning = gdk_rgba_to_string (warning_color); | ||
58 | - css_error = gdk_rgba_to_string (error_color); | ||
59 | - css_success = gdk_rgba_to_string (success_color); | ||
60 | - | ||
61 | /* Fetch size from the original icon */ | ||
62 | stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL); | ||
63 | pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error); | ||
64 | @@ -105,10 +92,6 @@ load_symbolic_svg (char *file_data, gsize file_len, | ||
65 | "</svg>", | ||
66 | NULL); | ||
67 | g_free (escaped_file_data); | ||
68 | - g_free (css_fg); | ||
69 | - g_free (css_warning); | ||
70 | - g_free (css_error); | ||
71 | - g_free (css_success); | ||
72 | g_free (svg_width); | ||
73 | g_free (svg_height); | ||
74 | |||
75 | @@ -167,7 +150,8 @@ make_symbolic_pixbuf (char *file, | ||
76 | GError **error) | ||
77 | |||
78 | { | ||
79 | - GdkRGBA r = { 1,0,0,1}, g = {0,1,0,1}; | ||
80 | + const char r[] = "rgba(255,0,0,1)"; | ||
81 | + const char g[] = "rgba(0,255,0,1)"; | ||
82 | GdkPixbuf *loaded; | ||
83 | GdkPixbuf *pixbuf; | ||
84 | int plane; | ||
85 | @@ -196,10 +180,10 @@ make_symbolic_pixbuf (char *file, | ||
86 | * the "rest", as all color fractions should add up to 1. | ||
87 | */ | ||
88 | loaded = load_symbolic_svg (file_data, file_len, width, height, | ||
89 | - &g, | ||
90 | - plane == 0 ? &r : &g, | ||
91 | - plane == 1 ? &r : &g, | ||
92 | - plane == 2 ? &r : &g, | ||
93 | + g, | ||
94 | + plane == 0 ? r : g, | ||
95 | + plane == 1 ? r : g, | ||
96 | + plane == 2 ? r : g, | ||
97 | error); | ||
98 | if (loaded == NULL) | ||
99 | return NULL; | ||
100 | -- | ||
101 | 2.1.4 | ||
102 | |||