From 7472bdb6ed1039b7f38afc728c034a13d0bbee0e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 27 Sep 2019 14:39:26 +0100 Subject: pango: fix the failing testiter test case The testiter test case fails if libthai support isn't enabled because it execises codepaths that need libthai to be correct. Backport a patch to skip this test if libthai isn't enabled. Signed-off-by: Ross Burton --- ...001-Skip-thai-break-tests-without-libthai.patch | 36 ++++++++++++++++++++++ meta/recipes-graphics/pango/pango_1.44.6.bb | 3 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch b/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch new file mode 100644 index 0000000000..3f9ebff33e --- /dev/null +++ b/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch @@ -0,0 +1,36 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 12beb39925b5a4574a7cfd86073b59bceb49f791 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 4 Sep 2019 15:51:06 -0400 +Subject: [PATCH] Skip thai break tests without libthai + +If we don't have libthai, these tests fail. + +Closes: https://gitlab.gnome.org/GNOME/pango/issues/420 +--- + tests/meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 4c22c12c..c617331f 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -89,9 +89,12 @@ test_breaks_data = [ + 'breaks/one', + 'breaks/two', + 'breaks/three', +- 'breaks/four', + ] + ++if thai_dep.found() ++ test_breaks_data += [ 'breaks/four', ] ++endif ++ + test_items_data = [ + 'itemize/one', + ] +-- +2.20.1 + diff --git a/meta/recipes-graphics/pango/pango_1.44.6.bb b/meta/recipes-graphics/pango/pango_1.44.6.bb index 882eada7a4..da7f2156dc 100644 --- a/meta/recipes-graphics/pango/pango_1.44.6.bb +++ b/meta/recipes-graphics/pango/pango_1.44.6.bb @@ -15,7 +15,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection -SRC_URI += "file://run-ptest" +SRC_URI += "file://run-ptest \ + file://0001-Skip-thai-break-tests-without-libthai.patch" SRC_URI[archive.md5sum] = "db0a3243ba33e02aaa775412f8e5f412" SRC_URI[archive.sha256sum] = "3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c" -- cgit 1.2.3-korg