From: Fabian Vogt Subject: Fix build with harfbuzz < 2.9.0 Index: qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc =================================================================== --- qtwebengine-everywhere-src-5.15.6.orig/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc +++ qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc @@ -71,11 +71,18 @@ sk_sp SubsetFont(SkTypeface* typ hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); // Owned by |input|. usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); +#if HB_VERSION_ATLEAST(2,9,0) hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); HbScoped subset_face(hb_subset_or_fail(face.get(), input.get())); if (!subset_face) return nullptr; +#else + hb_subset_input_set_retain_gids(input.get(), true); + + HbScoped subset_face(hb_subset(face.get(), input.get())); +#endif + HbScoped subset_blob(hb_face_reference_blob(subset_face.get())); if (!subset_blob) return nullptr;