From bb83bb06859636664be22ae4c61adde06082c2d3 Mon Sep 17 00:00:00 2001
From: Marta Rybczynska <marta.rybczynska@huawei.com>
Date: Tue, 2 Aug 2022 15:06:54 +0200
Subject: [PATCH] meta-oniro-staging: remove the harfbuzz patch
Remove the upstreamed patch in harfbuz..
Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
---
...613e8f825508afa9a0b54d33085557c37441.patch | 26 -------------------
.../harfbuzz/harfbuzz_%.bbappend | 6 -----
2 files changed, 32 deletions(-)
delete mode 100644 meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch
delete mode 100644 meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
diff --git a/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch b/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch
deleted file mode 100644
index e766397f..00000000
--- a/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e421613e8f825508afa9a0b54d33085557c37441 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Wed, 1 Jun 2022 09:07:57 -0600
-Subject: [PATCH] [sbix] Fix conditional
-
-Signed-off: Pavel Zhukov <pavel.zhukov@huawei.com>
-Upstream-Status: Submitted
-[https://lists.openembedded.org/g/openembedded-core/message/168163]
-
----
- src/hb-ot-color-sbix-table.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh
-index 6efae43cda..d0e2235fb2 100644
---- a/src/hb-ot-color-sbix-table.hh
-+++ b/src/hb-ot-color-sbix-table.hh
-@@ -298,7 +298,7 @@ struct sbix
-
- const PNGHeader &png = *blob->as<PNGHeader>();
-
-- if (png.IHDR.height >= 65536 | png.IHDR.width >= 65536)
-+ if (png.IHDR.height >= 65536 || png.IHDR.width >= 65536)
- {
- hb_blob_destroy (blob);
- return false;
diff --git a/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
deleted file mode 100644
index a90a4655..00000000
--- a/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI:append = " file://e421613e8f825508afa9a0b54d33085557c37441.patch "
--
GitLab