summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/pango/pango/insensitive-diff.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/pango/pango/insensitive-diff.patch')
-rw-r--r--meta/recipes-graphics/pango/pango/insensitive-diff.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-graphics/pango/pango/insensitive-diff.patch b/meta/recipes-graphics/pango/pango/insensitive-diff.patch
new file mode 100644
index 0000000000..faaa96133f
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango/insensitive-diff.patch
@@ -0,0 +1,28 @@
1Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed
2as (null) or (NULL).
3
4Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44]
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/tests/markup-parse.c b/tests/markup-parse.c
8index 633f3e89..36d2c776 100644
9--- a/tests/markup-parse.c
10+++ b/tests/markup-parse.c
11@@ -217,7 +217,7 @@ diff_with_file (const char *file1,
12 GString *string,
13 GError **error)
14 {
15- const char *command[] = { "diff", "-u", file1, NULL, NULL };
16+ const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL };
17 char *diff, *tmpfile;
18 int fd;
19
20@@ -237,7 +237,7 @@ diff_with_file (const char *file1,
21 goto done;
22 }
23 close (fd);
24- command[3] = tmpfile;
25+ command[4] = tmpfile;
26
27 /* run diff command */
28 g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error);