From 98b7499fc44b9fa2c36a2c15541c2633c15ca852 Mon Sep 17 00:00:00 2001 From: w00845693 Date: Tue, 5 Dec 2023 07:29:06 +0000 Subject: [PATCH] =?UTF-8?q?Description:=20=E6=B7=BB=E5=8A=A0readme,license?= =?UTF-8?q?,=E6=9B=B4=E6=96=B0patch=20IssueNo:=20https://gitee.com/openhar?= =?UTF-8?q?mony/third=5Fparty=5Fharfbuzz/issues/I8LXPB=20Feature=20or=20Bu?= =?UTF-8?q?gfix:=20Bugfix=20Binary=20Source:No=20Signed-off-by:=20wyk99=20?= =?UTF-8?q??= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- COPYING | 38 ++++++++++++++++++++++++++++++++++ README | 15 ++++++++++++++ huawei_harfbuzz.patch | 47 ++++++++++++++----------------------------- 3 files changed, 68 insertions(+), 32 deletions(-) create mode 100644 COPYING create mode 100644 README diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..48d1b30f --- /dev/null +++ b/COPYING @@ -0,0 +1,38 @@ +HarfBuzz is licensed under the so-called "Old MIT" license. Details follow. +For parts of HarfBuzz that are licensed under different licenses see individual +files names COPYING in subdirectories where applicable. + +Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020 Google, Inc. +Copyright © 2018,2019,2020 Ebrahim Byagowi +Copyright © 2019,2020 Facebook, Inc. +Copyright © 2012 Mozilla Foundation +Copyright © 2011 Codethink Limited +Copyright © 2008,2010 Nokia Corporation and/or its subsidiary(-ies) +Copyright © 2009 Keith Stribley +Copyright © 2009 Martin Hosken and SIL International +Copyright © 2007 Chris Wilson +Copyright © 2005,2006,2020,2021 Behdad Esfahbod +Copyright © 2005 David Turner +Copyright © 2004,2007,2008,2009,2010 Red Hat, Inc. +Copyright © 1998-2004 David Turner and Werner Lemberg + +For full copyright notices consult the individual files in the package. + + +Permission is hereby granted, without written agreement and without +license or royalty fees, to use, copy, modify, and distribute this +software and its documentation for any purpose, provided that the +above copyright notice and the following two paragraphs appear in +all copies of this software. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN +IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. diff --git a/README b/README new file mode 100644 index 00000000..84c542f8 --- /dev/null +++ b/README @@ -0,0 +1,15 @@ +This is HarfBuzz, a text shaping library. + +For bug reports, mailing list, and other information please visit: + + http://harfbuzz.org/ + +For license information, see https://github.com/harfbuzz/harfbuzz/blob/main/COPYING + +For build information, see https://github.com/harfbuzz/harfbuzz/blob/main/BUILD.md + +For custom configurations, see https://github.com/harfbuzz/harfbuzz/blob/main/CONFIG.md + +For test execution, see https://github.com/harfbuzz/harfbuzz/blob/main/TESTING.md + +Documentation: https://harfbuzz.github.io diff --git a/huawei_harfbuzz.patch b/huawei_harfbuzz.patch index 8dc8bf04..02f4364a 100644 --- a/huawei_harfbuzz.patch +++ b/huawei_harfbuzz.patch @@ -1,7 +1,7 @@ -diff --git a/harfbuzz-2.8.2/src/hb-buffer.h b/harfbuzz-2.8.2/src/hb-buffer.h +diff --git a/src/hb-buffer.h b/src/hb-buffer.h index 865ccb2..88f1f4c 100644 ---- a/harfbuzz-2.8.2/src/hb-buffer.h -+++ b/harfbuzz-2.8.2/src/hb-buffer.h +--- a/src/hb-buffer.h ++++ b/src/hb-buffer.h @@ -307,7 +307,8 @@ typedef enum { /*< flags >*/ HB_BUFFER_FLAG_EOT = 0x00000002u, /* End-of-text */ HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES = 0x00000004u, @@ -12,10 +12,10 @@ index 865ccb2..88f1f4c 100644 } hb_buffer_flags_t; HB_EXTERN void -diff --git a/harfbuzz-2.8.2/src/hb-open-type.hh b/harfbuzz-2.8.2/src/hb-open-type.hh +diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh index 406771f..b8ac4c5 100644 ---- a/harfbuzz-2.8.2/src/hb-open-type.hh -+++ b/harfbuzz-2.8.2/src/hb-open-type.hh +--- a/src/hb-open-type.hh ++++ b/src/hb-open-type.hh @@ -575,8 +575,13 @@ struct SortedUnsizedArrayOf : UnsizedArrayOf { return hb_sorted_array (this->arrayZ, len); } hb_sorted_array_t as_array (unsigned int len) const @@ -30,27 +30,10 @@ index 406771f..b8ac4c5 100644 template Type &bsearch (unsigned int len, const T &x, Type ¬_found = Crap (Type)) -diff --git a/harfbuzz-2.8.2/src/hb-ot-color-sbix-table.hh b/harfbuzz-2.8.2/src/hb-ot-color-sbix-table.hh -index af1e4a5..e085ee0 100644 ---- a/harfbuzz-2.8.2/src/hb-ot-color-sbix-table.hh -+++ b/harfbuzz-2.8.2/src/hb-ot-color-sbix-table.hh -@@ -298,6 +298,12 @@ struct sbix - - const PNGHeader &png = *blob->as(); - -+ if ((png.IHDR.height >= 65536) | (png.IHDR.width >= 65536)) -+ { -+ hb_blob_destroy (blob); -+ return false; -+ } -+ - extents->x_bearing = x_offset; - extents->y_bearing = png.IHDR.height + y_offset; - extents->width = png.IHDR.width; -diff --git a/harfbuzz-2.8.2/src/hb-ot-layout-common.hh b/harfbuzz-2.8.2/src/hb-ot-layout-common.hh +diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index c78f820..c9d93a7 100644 ---- a/harfbuzz-2.8.2/src/hb-ot-layout-common.hh -+++ b/harfbuzz-2.8.2/src/hb-ot-layout-common.hh +--- a/src/hb-ot-layout-common.hh ++++ b/src/hb-ot-layout-common.hh @@ -445,6 +445,7 @@ struct RecordListOf : RecordArrayOf } }; @@ -433,10 +416,10 @@ index c78f820..c9d93a7 100644 typedef RecordListOf FeatureList; -diff --git a/harfbuzz-2.8.2/src/hb-ot-layout-gsubgpos.hh b/harfbuzz-2.8.2/src/hb-ot-layout-gsubgpos.hh +diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index c17bf92..f046c08 100644 ---- a/harfbuzz-2.8.2/src/hb-ot-layout-gsubgpos.hh -+++ b/harfbuzz-2.8.2/src/hb-ot-layout-gsubgpos.hh +--- a/src/hb-ot-layout-gsubgpos.hh ++++ b/src/hb-ot-layout-gsubgpos.hh @@ -535,7 +535,17 @@ struct hb_ot_apply_context_t : bool prev () { @@ -456,10 +439,10 @@ index c17bf92..f046c08 100644 { idx--; const hb_glyph_info_t &info = c->buffer->out_info[idx]; -diff --git a/harfbuzz-2.8.2/src/hb-static.cc b/harfbuzz-2.8.2/src/hb-static.cc +diff --git a/src/hb-static.cc b/src/hb-static.cc index ec4b241..bef2ce9 100644 ---- a/harfbuzz-2.8.2/src/hb-static.cc -+++ b/harfbuzz-2.8.2/src/hb-static.cc +--- a/src/hb-static.cc ++++ b/src/hb-static.cc @@ -39,8 +39,13 @@ #ifndef HB_NO_VISIBILITY #include "hb-ot-name-language-static.hh"