summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/harfbuzz
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-06-03 23:17:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-06 23:16:51 +0100
commitc602b72c2cc7b93217eff5019397ba479720c561 (patch)
tree0491684c8f312efbde049b634308ae3a7931fb40 /meta/recipes-graphics/harfbuzz
parent3d493f846bd684b1b0f52016258becebaeb0dfab (diff)
downloadpoky-c602b72c2cc7b93217eff5019397ba479720c561.tar.gz
harfbuzz: Fix unused-variable warning
Backport a patch to fix the issue (From OE-Core rev: aa67d21a2a3b18180475c7fc9e8e17f3c80831f5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/harfbuzz')
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch44
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
new file mode 100644
index 0000000000..c1d4df42a9
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
@@ -0,0 +1,44 @@
1From f96b2b653c605679b83a820b38f49a0a0f4baf42 Mon Sep 17 00:00:00 2001
2From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
3Date: Wed, 2 Jun 2021 14:08:11 +0300
4Subject: [PATCH] Removed unused variable `supp_size` from
5 plan_subset_encoding(...).
6
7Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/243d056ff1c2af583ceb67e5dfbfaac51dc96e63]
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 src/hb-subset-cff1.cc | 4 +---
11 1 file changed, 1 insertion(+), 3 deletions(-)
12
13diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
14index df322f8..35dae7b 100644
15--- a/src/hb-subset-cff1.cc
16+++ b/src/hb-subset-cff1.cc
17@@ -402,7 +402,7 @@ struct cff_subset_plan {
18 void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
19 {
20 const Encoding *encoding = acc.encoding;
21- unsigned int size0, size1, supp_size;
22+ unsigned int size0, size1;
23 hb_codepoint_t code, last_code = CFF_UNDEF_CODE;
24 hb_vector_t<hb_codepoint_t> supp_codes;
25
26@@ -412,7 +412,6 @@ struct cff_subset_plan {
27 return;
28 }
29
30- supp_size = 0;
31 supp_codes.init ();
32
33 subset_enc_num_codes = plan->num_output_glyphs () - 1;
34@@ -448,7 +447,6 @@ struct cff_subset_plan {
35 code_pair_t pair = { supp_codes[i], sid };
36 subset_enc_supp_codes.push (pair);
37 }
38- supp_size += SuppEncoding::static_size * supp_codes.length;
39 }
40 }
41 supp_codes.fini ();
42--
432.31.1
44
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
index 2353633071..1a0e651f6e 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
@@ -11,6 +11,7 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
11UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" 11UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
12 12
13SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ 13SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \
14 file://0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch \
14 " 15 "
15SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300" 16SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
16 17