summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-11-25 19:27:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-29 17:43:40 +0000
commit315cc3ab703dc4f00b8b3d32a69942ec36aefc72 (patch)
tree1b745e59ccf2b09e314d0c8312c86315e61c6d52 /meta/recipes-graphics
parentdecb74d362849ece8f93f40c1c36cbcbcd188927 (diff)
downloadpoky-315cc3ab703dc4f00b8b3d32a69942ec36aefc72.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch36
-rw-r--r--meta/recipes-graphics/pango/pango_1.44.7.bb (renamed from meta/recipes-graphics/pango/pango_1.44.6.bb)5
2 files changed, 2 insertions, 39 deletions
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
deleted file mode 100644
index 3f9ebff33e..0000000000
--- a/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 12beb39925b5a4574a7cfd86073b59bceb49f791 Mon Sep 17 00:00:00 2001
5From: Matthias Clasen <mclasen@redhat.com>
6Date: Wed, 4 Sep 2019 15:51:06 -0400
7Subject: [PATCH] Skip thai break tests without libthai
8
9If we don't have libthai, these tests fail.
10
11Closes: https://gitlab.gnome.org/GNOME/pango/issues/420
12---
13 tests/meson.build | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16diff --git a/tests/meson.build b/tests/meson.build
17index 4c22c12c..c617331f 100644
18--- a/tests/meson.build
19+++ b/tests/meson.build
20@@ -89,9 +89,12 @@ test_breaks_data = [
21 'breaks/one',
22 'breaks/two',
23 'breaks/three',
24- 'breaks/four',
25 ]
26
27+if thai_dep.found()
28+ test_breaks_data += [ 'breaks/four', ]
29+endif
30+
31 test_items_data = [
32 'itemize/one',
33 ]
34--
352.20.1
36
diff --git a/meta/recipes-graphics/pango/pango_1.44.6.bb b/meta/recipes-graphics/pango/pango_1.44.7.bb
index c741d5836a..afb56a6cde 100644
--- a/meta/recipes-graphics/pango/pango_1.44.6.bb
+++ b/meta/recipes-graphics/pango/pango_1.44.7.bb
@@ -16,10 +16,9 @@ GNOMEBASEBUILDCLASS = "meson"
16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection 16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
17 17
18SRC_URI += "file://run-ptest \ 18SRC_URI += "file://run-ptest \
19 file://0001-Skip-thai-break-tests-without-libthai.patch \
20 file://0001-Fix-build-reproducibility.patch" 19 file://0001-Fix-build-reproducibility.patch"
21SRC_URI[archive.md5sum] = "db0a3243ba33e02aaa775412f8e5f412" 20SRC_URI[archive.md5sum] = "c75cc5b833d934d98e83343832e20e5d"
22SRC_URI[archive.sha256sum] = "3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c" 21SRC_URI[archive.sha256sum] = "66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f"
23 22
24DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" 23DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
25 24