summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-07-14 14:25:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-16 21:21:13 +0100
commit36277510af80912e7e5e3c087941020c2fb21beb (patch)
tree830d9dfadd3b4cb282dc7389f1089a4ae88e37a7
parentabf3ec0314cc3ba45507f216197bf0fd7ce240b3 (diff)
downloadopenembedded-core-contrib-36277510af80912e7e5e3c087941020c2fb21beb.tar.gz
harfbuzz: upgrade 2.8.1 -> 2.8.2
License-Update: copyright years Signed-off-by: Alexander Kanavin <alex.kanavin@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-Removed-unused-variable-supp_size-from-plan_subset_e.patch44
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb)11
2 files changed, 5 insertions, 50 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
deleted file mode 100644
index c1d4df42a9..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f96b2b653c605679b83a820b38f49a0a0f4baf42 Mon Sep 17 00:00:00 2001
-From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
-Date: Wed, 2 Jun 2021 14:08:11 +0300
-Subject: [PATCH] Removed unused variable `supp_size` from
- plan_subset_encoding(...).
-
-Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/243d056ff1c2af583ceb67e5dfbfaac51dc96e63]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/hb-subset-cff1.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
-index df322f8..35dae7b 100644
---- a/src/hb-subset-cff1.cc
-+++ b/src/hb-subset-cff1.cc
-@@ -402,7 +402,7 @@ struct cff_subset_plan {
- void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
- {
- const Encoding *encoding = acc.encoding;
-- unsigned int size0, size1, supp_size;
-+ unsigned int size0, size1;
- hb_codepoint_t code, last_code = CFF_UNDEF_CODE;
- hb_vector_t<hb_codepoint_t> supp_codes;
-
-@@ -412,7 +412,6 @@ struct cff_subset_plan {
- return;
- }
-
-- supp_size = 0;
- supp_codes.init ();
-
- subset_enc_num_codes = plan->num_output_glyphs () - 1;
-@@ -448,7 +447,6 @@ struct cff_subset_plan {
- code_pair_t pair = { supp_codes[i], sid };
- subset_enc_supp_codes.push (pair);
- }
-- supp_size += SuppEncoding::static_size * supp_codes.length;
- }
- }
- supp_codes.fini ();
---
-2.31.1
-
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb
index 1a0e651f6e..6da76ad0a3 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb
@@ -4,16 +4,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
SECTION = "libs"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \
- file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
+ file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \
+ "
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
-SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \
- file://0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch \
- "
-SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7"
inherit meson pkgconfig lib_package gtk-doc gobject-introspection