forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-qt/qtwebengine: add Fedora patch for >= harfbuzz 3
I'd like to add the patches Google used for Chromium but we know this one works and I'd like the tree to be in a working state. Can swap patches later. Signed-off-by: Sam James <[email protected]>
- Loading branch information
1 parent
81df654
commit bfaec25
Showing
2 changed files
with
39 additions
and
0 deletions.
There are no files selected for viewing
32 changes: 32 additions & 0 deletions
32
dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-harfbuzz.patch | ||
--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc | ||
+++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc | ||
@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) { | ||
hb_set_t* glyphs = | ||
hb_subset_input_glyph_set(input.get()); // Owned by |input|. | ||
usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); | ||
- hb_subset_input_set_retain_gids(input.get(), true); | ||
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); | ||
|
||
- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get())); | ||
+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get())); | ||
HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get())); | ||
if (!subset_blob) | ||
return nullptr; | ||
--- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp | ||
+++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp | ||
@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, | ||
hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); | ||
glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);}); | ||
|
||
- hb_subset_input_set_retain_gids(input.get(), true); | ||
// TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. | ||
// If it isn't known if a font is 'tricky', retain the hints. | ||
- hb_subset_input_set_drop_hints(input.get(), false); | ||
- HBFace subset(hb_subset(face.get(), input.get())); | ||
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS | HB_SUBSET_FLAGS_NO_HINTING); | ||
+ HBFace subset(hb_subset_or_fail(face.get(), input.get())); | ||
HBBlob result(hb_face_reference_blob(subset.get())); | ||
return to_data(std::move(result)); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters