diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-08 08:42:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-10 08:25:28 +0100 |
commit | 1910a7055e93ec9006b796aa658c54c23f778ac2 (patch) | |
tree | 4c2faf261dd0a47ecf7e0abe070d5ca6ee24abe6 | |
parent | 4feac920c221777ea4fb7a81821a35ea77c4b7c5 (diff) | |
download | poky-1910a7055e93ec9006b796aa658c54c23f778ac2.tar.gz |
harfbuzz: upgrade 4.4.1 -> 5.1.0
(From OE-Core rev: 1cf79df7dd14c0bfa87364ff28fffb61e7c560fa)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_4.4.1.bb) | 6 |
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch new file mode 100644 index 0000000000..029ca2bfff --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 1bd3884bc0544ffbb6545ed2391f0932bb8d7d91 Mon Sep 17 00:00:00 2001 | ||
2 | From: psykose <alice@ayaya.dev> | ||
3 | Date: Mon, 1 Aug 2022 07:45:25 +0000 | ||
4 | Subject: [PATCH] fix signedness of char in tests | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | src/test-repacker.cc | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/src/test-repacker.cc b/src/test-repacker.cc | ||
13 | index 053c0c6..1b7e1f0 100644 | ||
14 | --- a/src/test-repacker.cc | ||
15 | +++ b/src/test-repacker.cc | ||
16 | @@ -112,9 +112,9 @@ static void start_lookup (int8_t type, | ||
17 | hb_serialize_context_t* c) | ||
18 | { | ||
19 | char lookup[] = { | ||
20 | - 0, type, // type | ||
21 | + 0, (char)type, // type | ||
22 | 0, 0, // flag | ||
23 | - 0, num_subtables, // num subtables | ||
24 | + 0, (char)num_subtables, // num subtables | ||
25 | }; | ||
26 | |||
27 | start_object (lookup, 6, c); | ||
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_4.4.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb index c2867d2a9f..4c2d774803 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_4.4.1.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb | |||
@@ -11,8 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ | |||
11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
12 | UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" | 12 | UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" |
13 | 13 | ||
14 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz" | 14 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ |
15 | SRC_URI[sha256sum] = "c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee" | 15 | file://0001-fix-signedness-of-char-in-tests.patch \ |
16 | " | ||
17 | SRC_URI[sha256sum] = "2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05" | ||
16 | 18 | ||
17 | inherit meson pkgconfig lib_package gtk-doc gobject-introspection | 19 | inherit meson pkgconfig lib_package gtk-doc gobject-introspection |
18 | 20 | ||