Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2021-09-26 21:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine" Sun Sep 26 21:48:33 2021 rev:73 rq:921014 version:5.15.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2021-09-13 16:24:57.930774840 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.1899/libqt5-qtwebengine.changes 2021-09-26 21:49:21.090825011 +0200 @@ -1,0 +2,9 @@ +Tue Sep 21 11:34:41 UTC 2021 - Fabian Vogt <[email protected]> + +- Add patches from Arch to fix build with HarfBuzz 3.0.0: + * chromium-harfbuzz-3.0.0.patch + * skia-harfbuzz-3.0.0.patch +- ... but don't break with < 2.9.0: + * chromium-older-harfbuzz.patch + +------------------------------------------------------------------- New: ---- chromium-harfbuzz-3.0.0.patch chromium-older-harfbuzz.patch skia-harfbuzz-3.0.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebengine.spec ++++++ --- /var/tmp/diff_new_pack.kXctAp/_old 2021-09-26 21:49:22.470826718 +0200 +++ /var/tmp/diff_new_pack.kXctAp/_new 2021-09-26 21:49:22.474826722 +0200 @@ -54,6 +54,10 @@ Patch6: 0001-Fix-build-with-glibc-2.34.patch # PATCH-FIX-UPSTREAM Patch7: 0001-return-ENOSYS-for-clone3.patch +Patch8: chromium-harfbuzz-3.0.0.patch +Patch9: skia-harfbuzz-3.0.0.patch +# PATCH-FIX-OPENSUSE +Patch10: chromium-older-harfbuzz.patch # http://www.chromium.org/blink is not ported to PowerPC & s390 ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint ++++++ chromium-harfbuzz-3.0.0.patch ++++++ Subject: Fix build with harfbuzz 3.0.0 Upstream backport copied from Arch and rebased. # https://github.com/chromium/chromium/commit/b289f6f3fcbc diff --git a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc index 8ff0540d9a..20a7d37474 100644 --- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc +++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc @@ -72,9 +72,11 @@ 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())); + if (!subset_face) + return nullptr; HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get())); if (!subset_blob) return nullptr; ++++++ chromium-older-harfbuzz.patch ++++++ From: Fabian Vogt <[email protected]> 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<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; ++++++ skia-harfbuzz-3.0.0.patch ++++++ Subject: Fix build with harfbuzz 3.0.0 Upstream backport copied from Arch and rebased. # Minimal diff for harfbuzz 3.0.0 support; based on: # https://github.com/google/skia/commit/66684b17b382 # https://github.com/google/skia/commit/51d83abcd24a diff --git a/src/3rdparty/chromium/third_party/skia/gn/skia.gni b/src/3rdparty/chromium/third_party/skia/gn/skia.gni index d98fdc19ee..199335d5c4 100644 --- a/src/3rdparty/chromium/third_party/skia/gn/skia.gni +++ b/src/3rdparty/chromium/third_party/skia/gn/skia.gni @@ -34,8 +34,6 @@ declare_args() { skia_include_multiframe_procs = false skia_lex = false skia_libgifcodec_path = "third_party/externals/libgifcodec" - skia_pdf_subset_harfbuzz = - false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz. skia_qt_path = getenv("QT_PATH") skia_skqp_global_error_tolerance = 0 skia_tools_require_resources = false @@ -99,6 +97,10 @@ declare_args() { skia_use_libfuzzer_defaults = true } +declare_args() { + skia_pdf_subset_harfbuzz = skia_use_harfbuzz +} + declare_args() { skia_compile_sksl_tests = skia_compile_processors skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype diff --git a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp index 81c37eef3a..2340a7937b 100644 --- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp +++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp @@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) { blob.release()); } +template<typename...> using void_t = void; +template<typename T, typename = void> +struct SkPDFHarfBuzzSubset { + // This is the HarfBuzz 3.0 interface. + // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of + // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported. + static HBFace Make(T input, hb_face_t* face) { + // 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_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/); + return HBFace(hb_subset_or_fail(face, input)); + } +}; +template<typename T> +struct SkPDFHarfBuzzSubset<T, void_t< + decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())), + decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())), + decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>())) + >> +{ + // This is the HarfBuzz 2.0 (non-public) interface, used if it exists. + // This code should be removed as soon as all users are migrated to the newer API. + static HBFace Make(T input, hb_face_t* face) { + hb_subset_input_set_retain_gids(input, 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, false); + return HBFace(hb_subset(face, input)); + } +}; + static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, const SkPDFGlyphUse& glyphUsage, int ttcIndex) { @@ -71,11 +102,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())); + HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get()); + if (!subset) { + return nullptr; + } HBBlob result(hb_face_reference_blob(subset.get())); return to_data(std::move(result)); } diff --git a/src/3rdparty/chromium/third_party/skia/third_party/harfbuzz/BUILD.gn b/src/3rdparty/chromium/third_party/skia/third_party/harfbuzz/BUILD.gn index 173830de62..4156607ef9 100644 --- a/src/3rdparty/chromium/third_party/skia/third_party/harfbuzz/BUILD.gn +++ b/src/3rdparty/chromium/third_party/skia/third_party/harfbuzz/BUILD.gn @@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) { system("harfbuzz") { include_dirs = [ "/usr/include/harfbuzz" ] libs = [ "harfbuzz" ] + if (skia_pdf_subset_harfbuzz) { + libs += [ "harfbuzz-subset" ] + } } } else { third_party("harfbuzz") {
