summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-08-05 11:32:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-06 11:24:27 +0100
commit9a0e6992cae6685d4b0b77355bbbc7d008384a84 (patch)
treeb9a6b81aff549b5c2d8076ab3f786da557ed6d4f
parente05d22f9400cbd4d6cb3e9b54f2039ec9d4469f6 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/pango/pango/insensitive-diff.patch28
-rw-r--r--meta/recipes-graphics/pango/pango_1.44.3.bb (renamed from meta/recipes-graphics/pango/pango_1.42.4.bb)22
2 files changed, 9 insertions, 41 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 @@
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);
diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.44.3.bb
index 58e1f41be5..1973c63f82 100644
--- a/meta/recipes-graphics/pango/pango_1.42.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.44.3.bb
@@ -16,18 +16,21 @@ GNOMEBASEBUILDCLASS = "meson"
16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection 16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
17 17
18SRC_URI += "file://run-ptest \ 18SRC_URI += "file://run-ptest \
19 file://insensitive-diff.patch" 19 "
20 20
21SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" 21SRC_URI[archive.md5sum] = "7f91f1b5883ff848b445ab11ebabcf03"
22SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" 22SRC_URI[archive.sha256sum] = "290bb100ca5c7025ec3f97332eaf783b76ba1f444110f06ac5ee3285e3e5aece"
23 23
24DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" 24DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
25 25
26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" 26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
27 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
28
27PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" 29PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
30PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false"
28 31
29GTKDOC_MESON_OPTION = "enable_docs" 32GTKDOC_MESON_OPTION = "gtk_doc"
30GIR_MESON_OPTION = 'gir' 33GIR_MESON_OPTION = 'introspection'
31 34
32LEAD_SONAME = "libpango-1.0*" 35LEAD_SONAME = "libpango-1.0*"
33LIBV = "1.8.0" 36LIBV = "1.8.0"
@@ -41,10 +44,3 @@ RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
41 pango-module-basic-fc pango-module-arabic-lang" 44 pango-module-basic-fc pango-module-arabic-lang"
42 45
43BBCLASSEXTEND = "native nativesdk" 46BBCLASSEXTEND = "native nativesdk"
44
45do_install_append () {
46 if [ "${PTEST_ENABLED}" != "1" ]; then
47 rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests
48 rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir}
49 fi
50}