1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00

pango: upgrade 1.44.6 -> 1.44.7

(From OE-Core rev: b40497f9c5c62e8102ea5a81345a4cf52824a32f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-11-25 19:27:58 +00:00
committed by Richard Purdie
parent decb74d362
commit 315cc3ab70
2 changed files with 2 additions and 39 deletions
@@ -1,36 +0,0 @@
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
From 12beb39925b5a4574a7cfd86073b59bceb49f791 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
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
@@ -16,10 +16,9 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
SRC_URI += "file://run-ptest \
file://0001-Skip-thai-break-tests-without-libthai.patch \
file://0001-Fix-build-reproducibility.patch"
SRC_URI[archive.md5sum] = "db0a3243ba33e02aaa775412f8e5f412"
SRC_URI[archive.sha256sum] = "3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c"
SRC_URI[archive.md5sum] = "c75cc5b833d934d98e83343832e20e5d"
SRC_URI[archive.sha256sum] = "66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"