summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-23 18:37:54 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-24 22:06:51 +0000
commita597c99fd4e7a53db9af75cd181e4fa821a2a588 (patch)
tree21a4560408520a7d3a2dd8d5ac6145feaf37bba2
parent2725d99b79b4caa9b301d206a2b1a7851d2b74cc (diff)
downloadpoky-a597c99fd4e7a53db9af75cd181e4fa821a2a588.tar.gz
harfbuzz: Add missing <cstdio> and <cstdlib> includes
(From OE-Core rev: b49b9338667894ac3e45a3cd0c4db2d2db4d9053) Signed-off-by: Khem Raj <raj.khem@gmail.com> 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-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch34
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
new file mode 100644
index 0000000000..13819f5cf8
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
@@ -0,0 +1,34 @@
1From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Mon, 16 Jan 2023 19:49:53 +0000
4Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing <cstdio> include
5
6This week's `gcc-13` snapshot cleaned further up it's standard headers
7and exposed missing declaration as a build failure:
8
9 ../test/threads/hb-subset-threads.cc: In function 'void test_operation(operation_t, const char*, const test_input_t&)':
10 ../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not declared in this scope
11
12 ../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
13 ../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not declared in this scope
14
15Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 test/threads/hb-subset-threads.cc | 2 ++
19 1 file changed, 2 insertions(+)
20
21diff --git a/test/threads/hb-subset-threads.cc b/test/threads/hb-subset-threads.cc
22index 9d86d8d51..f0e4b7e2a 100644
23--- a/test/threads/hb-subset-threads.cc
24+++ b/test/threads/hb-subset-threads.cc
25@@ -1,4 +1,6 @@
26 #include <cassert>
27+#include <cstdio>
28+#include <cstdlib>
29 #include <cstring>
30 #include <thread>
31 #include <condition_variable>
32--
332.39.1
34
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
index ae54bad643..1fce127d07 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
8 file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ 8 file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \
9 " 9 "
10 10
11SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" 11SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \
12 file://0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch"
12SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4" 13SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4"
13 14
14inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases 15inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases