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)
downloadopenembedded-core-contrib-9a0e6992cae6685d4b0b77355bbbc7d008384a84.tar.gz
openembedded-core-contrib-9a0e6992cae6685d4b0b77355bbbc7d008384a84.tar.bz2
openembedded-core-contrib-9a0e6992cae6685d4b0b77355bbbc7d008384a84.zip
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 @@
-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.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"
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"
+SRC_URI[archive.md5sum] = "7f91f1b5883ff848b445ab11ebabcf03"
+SRC_URI[archive.sha256sum] = "290bb100ca5c7025ec3f97332eaf783b76ba1f444110f06ac5ee3285e3e5aece"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+
PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
+PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false"
-GTKDOC_MESON_OPTION = "enable_docs"
-GIR_MESON_OPTION = 'gir'
+GTKDOC_MESON_OPTION = "gtk_doc"
+GIR_MESON_OPTION = 'introspection'
LEAD_SONAME = "libpango-1.0*"
LIBV = "1.8.0"
@@ -41,10 +44,3 @@ RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
pango-module-basic-fc pango-module-arabic-lang"
BBCLASSEXTEND = "native nativesdk"
-
-do_install_append () {
- if [ "${PTEST_ENABLED}" != "1" ]; then
- rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests
- rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir}
- fi
-}