From f40a5d240cc15abca8968b2277b0f640318ad1c6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 6 Aug 2019 12:47:17 +0100 Subject: pango: upgrade to 1.44.5 This release ships some files that were previously missing from git but needed for the test suite. Add RDEPENDS on locale-base-en-us as some of the tests explictly use it. No need to depend on liberation-fonts, all of the tests use Cantarell. With these changes, just one test fails (filed upstream as https://gitlab.gnome.org/GNOME/pango/issues/405) and there are no skips. (From OE-Core rev: 6db9109058be33b10d68949fe72273e8a92f9f12) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/pango/pango_1.44.3.bb | 46 ----------------------------- meta/recipes-graphics/pango/pango_1.44.5.bb | 45 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango_1.44.3.bb create mode 100644 meta/recipes-graphics/pango/pango_1.44.5.bb diff --git a/meta/recipes-graphics/pango/pango_1.44.3.bb b/meta/recipes-graphics/pango/pango_1.44.3.bb deleted file mode 100644 index 1973c63f82..0000000000 --- a/meta/recipes-graphics/pango/pango_1.44.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Framework for layout and rendering of internationalized text" -DESCRIPTION = "Pango is a library for laying out and rendering of text, \ -with an emphasis on internationalization. Pango can be used anywhere \ -that text layout is needed, though most of the work on Pango so far has \ -been done in the context of the GTK+ widget toolkit. Pango forms the \ -core of text and font handling for GTK+-2.x." -HOMEPAGE = "http://www.pango.org/" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" -LICENSE = "LGPLv2.0+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection - -SRC_URI += "file://run-ptest \ - " - -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)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" - -PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" -PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" - -GTKDOC_MESON_OPTION = "gtk_doc" -GIR_MESON_OPTION = 'introspection' - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" - -FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" - -RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ - pango-module-basic-fc pango-module-arabic-lang" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/pango/pango_1.44.5.bb b/meta/recipes-graphics/pango/pango_1.44.5.bb new file mode 100644 index 0000000000..a143723c7c --- /dev/null +++ b/meta/recipes-graphics/pango/pango_1.44.5.bb @@ -0,0 +1,45 @@ +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" +LICENSE = "LGPLv2.0+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection + +SRC_URI += "file://run-ptest" +SRC_URI[archive.md5sum] = "b6bf689e3ce4f46b0fd887b64c850ea1" +SRC_URI[archive.sha256sum] = "8527dfcbeedb4390149b6f94620c0fa64e26046ab85042c2a7556438847d7fc1" + +DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" + +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 = "gtk_doc" +GIR_MESON_OPTION = 'introspection' + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.8.0" + +FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +RDEPENDS_${PN}-ptest += "cantarell-fonts" +RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" + +RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ + pango-module-basic-fc pango-module-arabic-lang" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf