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 | 23 |
1 files changed, 11 insertions, 12 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 25410b11ea..80c93e2166 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f00603d58d844422363b896ea7d07aaf48ddaa66 Mon Sep 17 00:00:00 2001 | 1 | From 9b4f5738f8ac30f393b6163dcc84757976683d9b Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 | 3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 |
4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal | 4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal |
@@ -6,18 +6,17 @@ Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal | |||
6 | 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 |
7 | non-zero if the loader had errors (missing libraries, generally). | 7 | non-zero if the loader had errors (missing libraries, generally). |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/144] |
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- | 12 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- |
14 | 1 file changed, 15 insertions(+), 4 deletions(-) | 13 | 1 file changed, 15 insertions(+), 4 deletions(-) |
15 | 14 | ||
16 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c | 15 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c |
17 | index 312aa78..b813d99 100644 | 16 | index baa9a5c..9b6fa89 100644 |
18 | --- a/gdk-pixbuf/queryloaders.c | 17 | --- a/gdk-pixbuf/queryloaders.c |
19 | +++ b/gdk-pixbuf/queryloaders.c | 18 | +++ b/gdk-pixbuf/queryloaders.c |
20 | @@ -212,7 +212,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) | 19 | @@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) |
21 | g_string_append_c (contents, '\n'); | 20 | g_string_append_c (contents, '\n'); |
22 | } | 21 | } |
23 | 22 | ||
@@ -26,7 +25,7 @@ index 312aa78..b813d99 100644 | |||
26 | query_module (GString *contents, const char *dir, const char *file) | 25 | query_module (GString *contents, const char *dir, const char *file) |
27 | { | 26 | { |
28 | char *path; | 27 | char *path; |
29 | @@ -221,6 +221,7 @@ query_module (GString *contents, const char *dir, const char *file) | 28 | @@ -225,6 +225,7 @@ query_module (GString *contents, const char *dir, const char *file) |
30 | void (*fill_vtable) (GdkPixbufModule *module); | 29 | void (*fill_vtable) (GdkPixbufModule *module); |
31 | gpointer fill_info_ptr; | 30 | gpointer fill_info_ptr; |
32 | gpointer fill_vtable_ptr; | 31 | gpointer fill_vtable_ptr; |
@@ -34,7 +33,7 @@ index 312aa78..b813d99 100644 | |||
34 | 33 | ||
35 | if (g_path_is_absolute (file)) | 34 | if (g_path_is_absolute (file)) |
36 | path = g_strdup (file); | 35 | path = g_strdup (file); |
37 | @@ -270,10 +271,13 @@ query_module (GString *contents, const char *dir, const char *file) | 36 | @@ -274,10 +275,13 @@ query_module (GString *contents, const char *dir, const char *file) |
38 | g_module_error()); | 37 | g_module_error()); |
39 | else | 38 | else |
40 | g_fprintf (stderr, "Cannot load loader %s\n", path); | 39 | g_fprintf (stderr, "Cannot load loader %s\n", path); |
@@ -47,8 +46,8 @@ index 312aa78..b813d99 100644 | |||
47 | + return ret; | 46 | + return ret; |
48 | } | 47 | } |
49 | 48 | ||
50 | #ifdef G_OS_WIN32 | 49 | #if defined(G_OS_WIN32) && defined(GDK_PIXBUF_RELOCATABLE) |
51 | @@ -314,6 +318,7 @@ int main (int argc, char **argv) | 50 | @@ -318,6 +322,7 @@ int main (int argc, char **argv) |
52 | gint first_file = 1; | 51 | gint first_file = 1; |
53 | GFile *pixbuf_libdir_file; | 52 | GFile *pixbuf_libdir_file; |
54 | gchar *pixbuf_libdir; | 53 | gchar *pixbuf_libdir; |
@@ -56,7 +55,7 @@ index 312aa78..b813d99 100644 | |||
56 | 55 | ||
57 | #ifdef G_OS_WIN32 | 56 | #ifdef G_OS_WIN32 |
58 | gchar *libdir; | 57 | gchar *libdir; |
59 | @@ -452,7 +457,9 @@ int main (int argc, char **argv) | 58 | @@ -456,7 +461,9 @@ int main (int argc, char **argv) |
60 | } | 59 | } |
61 | modules = g_list_sort (modules, (GCompareFunc)strcmp); | 60 | modules = g_list_sort (modules, (GCompareFunc)strcmp); |
62 | for (l = modules; l != NULL; l = l->next) | 61 | for (l = modules; l != NULL; l = l->next) |
@@ -67,7 +66,7 @@ index 312aa78..b813d99 100644 | |||
67 | g_list_free_full (modules, g_free); | 66 | g_list_free_full (modules, g_free); |
68 | g_free (moduledir); | 67 | g_free (moduledir); |
69 | #else | 68 | #else |
70 | @@ -468,7 +475,8 @@ int main (int argc, char **argv) | 69 | @@ -472,7 +479,8 @@ int main (int argc, char **argv) |
71 | infilename = g_locale_to_utf8 (infilename, | 70 | infilename = g_locale_to_utf8 (infilename, |
72 | -1, NULL, NULL, NULL); | 71 | -1, NULL, NULL, NULL); |
73 | #endif | 72 | #endif |
@@ -77,7 +76,7 @@ index 312aa78..b813d99 100644 | |||
77 | } | 76 | } |
78 | g_free (cwd); | 77 | g_free (cwd); |
79 | } | 78 | } |
80 | @@ -486,5 +494,8 @@ int main (int argc, char **argv) | 79 | @@ -492,5 +500,8 @@ int main (int argc, char **argv) |
81 | 80 | ||
82 | g_free (pixbuf_libdir); | 81 | g_free (pixbuf_libdir); |
83 | 82 | ||