Skip to content

Commit 1208b4f

Browse files
committed
firefox: fix build with -Werror,-Wunused-but-set-variable
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 parent a67e0e9 commit 1208b4f

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 63a475504ebf915000634b7fee3f4ce7feefea07 Mon Sep 17 00:00:00 2001
2+
From: Martin Jansa <Martin.Jansa@gmail.com>
3+
Date: Thu, 2 Sep 2021 15:00:08 +0200
4+
Subject: [PATCH] Fix build with -Werror,-Wunused-but-set-variable
5+
6+
Fixes:
7+
8+
firefox/68.9.0esr-r0/firefox-68.9.0/gfx/harfbuzz/src/hb-subset-cff1.cc:467:33: error: variable 'supp_size' set but not used [-Werror,-Wunused-but-set-variable]
9+
10+
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11+
---
12+
gfx/harfbuzz/src/hb-subset-cff1.cc | 4 +---
13+
1 file changed, 1 insertion(+), 3 deletions(-)
14+
15+
diff --git a/gfx/harfbuzz/src/hb-subset-cff1.cc b/gfx/harfbuzz/src/hb-subset-cff1.cc
16+
index 49ac0bf429..d51842e297 100644
17+
--- a/gfx/harfbuzz/src/hb-subset-cff1.cc
18+
+++ b/gfx/harfbuzz/src/hb-subset-cff1.cc
19+
@@ -464,12 +464,11 @@ struct cff_subset_plan {
20+
unsigned int plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
21+
{
22+
const Encoding *encoding = acc.encoding;
23+
- unsigned int size0, size1, supp_size;
24+
+ unsigned int size0, size1;
25+
hb_codepoint_t code, last_code = CFF_UNDEF_CODE;
26+
hb_vector_t<hb_codepoint_t> supp_codes;
27+
28+
subset_enc_code_ranges.resize (0);
29+
- supp_size = 0;
30+
supp_codes.init ();
31+
32+
subset_enc_num_codes = plan->num_output_glyphs () - 1;
33+
@@ -505,7 +504,6 @@ struct cff_subset_plan {
34+
code_pair_t pair = { supp_codes[i], sid };
35+
subset_enc_supp_codes.push (pair);
36+
}
37+
- supp_size += SuppEncoding::static_size * supp_codes.length;
38+
}
39+
}
40+
supp_codes.fini ();

meta-firefox/recipes-browser/firefox/firefox_68.9.0esr.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ SRC_URI = "https://ftp.mozilla.org/pub/firefox/releases/${PV}/source/firefox-${P
3232
file://fixes/link-with-libpangoft.patch \
3333
file://fixes/0001-Bug-1721326-Fix-build-with-glibc-2.34.patch \
3434
file://fixes/0002-security-Fix-build-with-glibc-2.34.patch \
35+
file://fixes/0003-Fix-build-with-Werror-Wunused-but-set-variable.patch \
3536
file://porting/Add-xptcall-support-for-SH4-processors.patch \
3637
file://porting/NSS-Fix-FTBFS-on-Hurd-because-of-MAXPATHLEN.patch \
3738
file://porting/Work-around-Debian-bug-844357.patch \

0 commit comments

Comments
 (0)