diff options
Diffstat (limited to 'poky/meta/recipes-graphics/pango')
| -rw-r--r-- | poky/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch | 45 | ||||
| -rw-r--r-- | poky/meta/recipes-graphics/pango/pango_1.50.6.bb (renamed from poky/meta/recipes-graphics/pango/pango_1.50.4.bb) | 10 |
2 files changed, 49 insertions, 6 deletions
diff --git a/poky/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch b/poky/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch new file mode 100644 index 0000000000..ec7fb4727e --- /dev/null +++ b/poky/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch @@ -0,0 +1,45 @@ +From b9bfe3a79f165682a6db3d7ee1928365e93b1ccf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 19:39:29 -0700 +Subject: [PATCH] Skip running test-layout test + +This fails intermittently, it varies based on what version of harfbuzz +is installed and if it does not match with what pango CI tests then we +get random failures in this test. This has been disabled in other +distros [1] too + +We want to drop this on next upgrade and see if this test passes if not +then keep it disabled + +Fixes + +Running test: pango/test-layout.test +1..36 +ok 1 /layout/letterspacing.layout +ok 2 /layout/valid-7.layout +not ok 3 /layout/valid-14.layout +Bail out! +FAIL: pango/test-layout.test (Child process killed by signal 6) + +[1] https://github.com/archlinux/svntogit-packages/commit/3f883e7ff8071adad23b6bcc0ba4b995aff10d52 + +Upstream-Status: Inappropriate [bugfix https://gitlab.gnome.org/GNOME/pango/-/issues/677] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/test-layout.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test-layout.c b/tests/test-layout.c +index 1139e4f..b47a066 100644 +--- a/tests/test-layout.c ++++ b/tests/test-layout.c +@@ -222,5 +222,5 @@ main (int argc, char *argv[]) + } + g_dir_close (dir); + +- return g_test_run (); ++ return 77; + } +-- +2.35.2 + diff --git a/poky/meta/recipes-graphics/pango/pango_1.50.4.bb b/poky/meta/recipes-graphics/pango/pango_1.50.6.bb index 0ea621bf67..93e1653464 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.50.4.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.50.6.bb @@ -18,9 +18,11 @@ inherit gnomebase gi-docgen ptest-gnome upstream-version-is-even gobject-introsp GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" -SRC_URI += "file://run-ptest" +SRC_URI += "file://run-ptest \ + file://0001-Skip-running-test-layout-test.patch \ +" -SRC_URI[archive.sha256sum] = "f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162" +SRC_URI[archive.sha256sum] = "a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" @@ -37,10 +39,6 @@ do_configure:prepend() { chmod +x ${S}/tests/*.py } -do_configure:prepend:toolchain-clang() { - sed -i -e "/Werror=implicit-fallthrough/d" ${S}/meson.build -} - LEAD_SONAME = "libpango-1.0*" FILES:${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" |