summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/pango
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-04 13:47:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-04 14:30:14 +0000
commitb19a6501599ba7567c7c7d1456b62a8702a7e82a (patch)
tree3e57db213e55c084cf375df7a9f3d862f4f9b6c8 /meta/recipes-graphics/pango
parent92d23674587fb9c6634b9ba88b8399b0ec40bd1c (diff)
downloadopenembedded-core-contrib-b19a6501599ba7567c7c7d1456b62a8702a7e82a.tar.gz
openembedded-core-contrib-b19a6501599ba7567c7c7d1456b62a8702a7e82a.tar.bz2
openembedded-core-contrib-b19a6501599ba7567c7c7d1456b62a8702a7e82a.zip
pango: fix markup-parse test case
The test case expects that printf(0x0) is (null) but for us this it is (NULL). Use case-insensitive diff as the rest of the tests don't care about case. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/pango')
-rw-r--r--meta/recipes-graphics/pango/pango/insensitive-diff.patch28
-rw-r--r--meta/recipes-graphics/pango/pango_1.42.4.bb3
2 files changed, 30 insertions, 1 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 @@
+Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed
+as (null) or (NULL).
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/tests/markup-parse.c b/tests/markup-parse.c
+index 633f3e89..36d2c776 100644
+--- a/tests/markup-parse.c
++++ b/tests/markup-parse.c
+@@ -217,7 +217,7 @@ diff_with_file (const char *file1,
+ GString *string,
+ GError **error)
+ {
+- const char *command[] = { "diff", "-u", file1, NULL, NULL };
++ const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL };
+ char *diff, *tmpfile;
+ int fd;
+
+@@ -237,7 +237,7 @@ diff_with_file (const char *file1,
+ goto done;
+ }
+ close (fd);
+- command[3] = tmpfile;
++ command[4] = tmpfile;
+
+ /* run diff command */
+ g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error);
diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.42.4.bb
index e181bcb500..d3357f82de 100644
--- a/meta/recipes-graphics/pango/pango_1.42.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.42.4.bb
@@ -16,7 +16,8 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
SRC_URI += "file://run-ptest \
-"
+ file://insensitive-diff.patch"
+
SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"