diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-08-05 11:32:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-06 11:24:27 +0100 |
commit | 9a0e6992cae6685d4b0b77355bbbc7d008384a84 (patch) | |
tree | b9a6b81aff549b5c2d8076ab3f786da557ed6d4f /meta/recipes-graphics/pango/pango/insensitive-diff.patch | |
parent | e05d22f9400cbd4d6cb3e9b54f2039ec9d4469f6 (diff) | |
download | openembedded-core-contrib-9a0e6992cae6685d4b0b77355bbbc7d008384a84.tar.gz |
pango: upgrade 1.42.4 -> 1.44.3
* For changes, see:
https://github.com/GNOME/pango/blob/master/NEWS
* Remove upstreamed patch, rename docs and introspection meson
options and add PACKAGECONFIG for tests.
(From OE-Core rev: e7fcd745977a86926f83edeaaf31efad70002da8)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/pango/pango/insensitive-diff.patch')
-rw-r--r-- | meta/recipes-graphics/pango/pango/insensitive-diff.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-graphics/pango/pango/insensitive-diff.patch b/meta/recipes-graphics/pango/pango/insensitive-diff.patch deleted file mode 100644 index faaa96133f..0000000000 --- a/meta/recipes-graphics/pango/pango/insensitive-diff.patch +++ /dev/null @@ -1,28 +0,0 @@ -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); |