File chromium-older-harfbuzz.patch of Package chromium-ffmpeg-extra

File chromium-older-harfbuzz.patch of Package chromium-ffmpeg-extra (Revision 19)

Currently displaying revision 19 , Show latest

From: Fabian Vogt <fvogt@suse.com>
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
===================================================================
--- a/components/paint_preview/common/subset_font.cc
+++ b/components/paint_preview/common/subset_font.cc
@@ -71,11 +71,18 @@ sk_sp<SkData> 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<hb_face_t> 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<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
+#endif
+
   HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
   if (!subset_blob)
     return nullptr;