diff options
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch index 70146c6181..7d0d54bafe 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | |||
@@ -1,11 +1,20 @@ | |||
1 | From b6a7b30522455cab39a0b9ea8463313380146e70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 | ||
4 | Subject: [PATCH 3/4] gdk-pixbuf: add an option so that loader errors are fatal | ||
5 | |||
1 | If an environment variable is specified set the return value from main() to | 6 | If an environment variable is specified set the return value from main() to |
2 | non-zero if the loader had errors (missing libraries, generally). | 7 | non-zero if the loader had errors (missing libraries, generally). |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
6 | 11 | ||
12 | --- | ||
13 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- | ||
14 | 1 file changed, 15 insertions(+), 4 deletions(-) | ||
15 | |||
7 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c | 16 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c |
8 | index a9ca015..395674a 100644 | 17 | index a81c804..350bec8 100644 |
9 | --- a/gdk-pixbuf/queryloaders.c | 18 | --- a/gdk-pixbuf/queryloaders.c |
10 | +++ b/gdk-pixbuf/queryloaders.c | 19 | +++ b/gdk-pixbuf/queryloaders.c |
11 | @@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) | 20 | @@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) |
@@ -47,17 +56,18 @@ index a9ca015..395674a 100644 | |||
47 | 56 | ||
48 | #ifdef G_OS_WIN32 | 57 | #ifdef G_OS_WIN32 |
49 | gchar *libdir; | 58 | gchar *libdir; |
50 | @@ -360,7 +365,8 @@ int main (int argc, char **argv) | 59 | @@ -370,7 +375,9 @@ int main (int argc, char **argv) |
51 | gint len = strlen (dent); | 60 | } |
52 | if (len > SOEXT_LEN && | 61 | modules = g_list_sort (modules, (GCompareFunc)strcmp); |
53 | strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) { | 62 | for (l = modules; l != NULL; l = l->next) |
54 | - query_module (contents, path, dent); | 63 | - query_module (contents, path, l->data); |
55 | + if (!query_module (contents, path, dent)) | 64 | + if (!query_module (contents, path, l->data)) |
56 | + success = FALSE; | 65 | + success = FALSE; |
57 | } | 66 | + |
58 | } | 67 | g_list_free_full (modules, g_free); |
59 | g_dir_close (dir); | 68 | #else |
60 | @@ -378,7 +384,8 @@ int main (int argc, char **argv) | 69 | g_string_append_printf (contents, "# dynamic loading of modules not supported\n"); |
70 | @@ -385,7 +392,8 @@ int main (int argc, char **argv) | ||
61 | infilename = g_locale_to_utf8 (infilename, | 71 | infilename = g_locale_to_utf8 (infilename, |
62 | -1, NULL, NULL, NULL); | 72 | -1, NULL, NULL, NULL); |
63 | #endif | 73 | #endif |
@@ -67,7 +77,7 @@ index a9ca015..395674a 100644 | |||
67 | } | 77 | } |
68 | g_free (cwd); | 78 | g_free (cwd); |
69 | } | 79 | } |
70 | @@ -394,5 +401,8 @@ int main (int argc, char **argv) | 80 | @@ -401,5 +409,8 @@ int main (int argc, char **argv) |
71 | else | 81 | else |
72 | g_print ("%s\n", contents->str); | 82 | g_print ("%s\n", contents->str); |
73 | 83 | ||
@@ -77,3 +87,6 @@ index a9ca015..395674a 100644 | |||
77 | + else | 87 | + else |
78 | + return 0; | 88 | + return 0; |
79 | } | 89 | } |
90 | -- | ||
91 | 2.14.1 | ||
92 | |||