commit 869c6950922357b87b78daf41417dd103b5905c4 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sat Sep 4 13:29:37 2021 +0100 Add patch for old freetype chromium-93-old-freetype.patch | 52 ++++++++++++++++++++++++++++++++++++++++++ chromium-freeworld.spec | 1 + 2 files changed, 53 insertions(+) --- diff --git a/chromium-93-old-freetype.patch b/chromium-93-old-freetype.patch new file mode 100644 index 0000000..0c0e95e --- /dev/null +++ b/chromium-93-old-freetype.patch @@ -0,0 +1,52 @@ +diff -up chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp +--- chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 2021-09-02 08:49:18.996863417 -0400 ++++ chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp 2021-09-02 08:56:07.716626801 -0400 +@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas, + canvas->drawPaint(colrPaint); + break; + } ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 + case FT_COLR_PAINTFORMAT_TRANSFORM: ++#else ++ case FT_COLR_PAINTFORMAT_TRANSFORMED: ++#endif + case FT_COLR_PAINTFORMAT_TRANSLATE: + case FT_COLR_PAINTFORMAT_SCALE: + case FT_COLR_PAINTFORMAT_ROTATE: +@@ -760,10 +764,17 @@ void colrv1_transform(SkCanvas* canvas, + SkMatrix transform; + + switch (colrv1_paint.format) { ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 + case FT_COLR_PAINTFORMAT_TRANSFORM: { + transform = ToSkMatrix(colrv1_paint.u.transform.affine); + break; + } ++#else ++ case FT_COLR_PAINTFORMAT_TRANSFORMED: { ++ transform = ToSkMatrix(colrv1_paint.u.transformed.affine); ++ break; ++ } ++#endif + case FT_COLR_PAINTFORMAT_TRANSLATE: { + transform = SkMatrix::Translate( + SkFixedToScalar(colrv1_paint.u.translate.dx), +@@ -889,11 +900,18 @@ bool colrv1_traverse_paint(SkCanvas* can + traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, + FT_COLOR_NO_ROOT_TRANSFORM); + break; ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 + case FT_COLR_PAINTFORMAT_TRANSFORM: + colrv1_transform(canvas, face, paint); + traverse_result = colrv1_traverse_paint(canvas, palette, face, + paint.u.transform.paint, visited_set); + break; ++#else ++ case FT_COLR_PAINTFORMAT_TRANSFORMED: ++ colrv1_transform(canvas, face, paint); ++ traverse_result = colrv1_traverse_paint(canvas, palette, face, ++ paint.u.transformed.paint, visited_set); ++#endif + case FT_COLR_PAINTFORMAT_TRANSLATE: + colrv1_transform(canvas, face, paint); + traverse_result = colrv1_traverse_paint(canvas, palette, face, diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 34c74fd..35f1dfb 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -170,6 +170,7 @@ Patch302: chromium-py3-fixes.patch Patch303: chromium-java-only-allowed-in-android-builds.patch Patch304: chromium-update-highway-0.12.2.patch Patch305: chromium-aarch64-cxxflags-addition.patch +Patch306: chromium-93-old-freetype.patch Patch1303: chromium-rawhide-gcc-std-max-fix.patch # RPM Fusion patches [free/chromium-freeworld]: