summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-02-19 20:30:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-20 15:18:30 +0000
commit389ade51b4011ed72d075069f954cccdbf57cca8 (patch)
tree89f0f9caeba44bec8c5a019202829844bfad306b /meta
parent9721ad49f1b2d16a6610b2422c1eff5d2e1bbf68 (diff)
downloadpoky-389ade51b4011ed72d075069f954cccdbf57cca8.tar.gz
harfbuzz: upgrade 6.0.0 -> 7.0.0
License-Update: copyright years (From OE-Core rev: f7532332e9dde401d9cca5b7f53e2a4e47164261) 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>
Diffstat (limited to 'meta')
-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_7.0.0.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb)7
2 files changed, 3 insertions, 38 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
deleted file mode 100644
index 13819f5cf8..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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_7.0.0.bb
index 1fce127d07..a85c4ca1ce 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
@@ -4,13 +4,12 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
4BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" 4BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
5SECTION = "libs" 5SECTION = "libs"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
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] = "7b4685b7066c5c6b8dc6cd7b02f63c554fb8cc1c4ddcfc44bc284efa3c20cf28"
13SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4"
14 13
15inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases 14inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases
16 15