diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-08-25 12:32:08 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-08-25 12:32:08 +0000 |
| commit | 1cdefcc128a391acc976207102f7169c535d2a41 (patch) | |
| tree | b5593b29c357e4292337efe68d8c4feacdbf3738 | |
| parent | b2167c8d495da914a4f5a77d7564349700a54f59 (diff) | |
| download | asb-1cdefcc128a391acc976207102f7169c535d2a41.tar.gz asb-1cdefcc128a391acc976207102f7169c535d2a41.tar.xz | |
Initial revision
| -rw-r--r-- | libreoffice/build/patches/libreoffice.skia.patch | 10 | ||||
| -rw-r--r-- | libreoffice/build/patches/skia_freetype211.patch | 37 |
2 files changed, 47 insertions, 0 deletions
diff --git a/libreoffice/build/patches/libreoffice.skia.patch b/libreoffice/build/patches/libreoffice.skia.patch new file mode 100644 index 00000000..f060a3a6 --- /dev/null +++ b/libreoffice/build/patches/libreoffice.skia.patch @@ -0,0 +1,10 @@ +--- libreoffice-7.2.0.4/external/skia/UnpackedTarball_skia.mk.orig 2021-08-16 21:56:28.000000000 +0200 ++++ libreoffice-7.2.0.4/external/skia/UnpackedTarball_skia.mk 2021-08-25 08:36:26.702302354 +0200 +@@ -39,6 +39,7 @@ + fast-png-write.patch.1 \ + skia_sk_cpu_sse_level_0_by_default.patch.1 \ + fix-warnings.patch.1 \ ++ skia_freetype211.patch \ + + $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) + diff --git a/libreoffice/build/patches/skia_freetype211.patch b/libreoffice/build/patches/skia_freetype211.patch new file mode 100644 index 00000000..97be7f28 --- /dev/null +++ b/libreoffice/build/patches/skia_freetype211.patch @@ -0,0 +1,37 @@ +--- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100 ++++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200 +@@ -665,8 +665,13 @@ + canvas->drawPaint(paint); + break; + } ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 ++ case FT_COLR_PAINTFORMAT_TRANSFORM: { ++ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine); ++#else + case FT_COLR_PAINTFORMAT_TRANSFORMED: { + SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); ++#endif + + canvas->concat(transform); + break; +@@ -760,12 +765,20 @@ + 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: ++#else + case FT_COLR_PAINTFORMAT_TRANSFORMED: ++#endif + canvas->saveLayer(nullptr, nullptr); + // Traverse / draw operation will apply transform. + colrv1_draw_paint(canvas, palette, face, paint); + traverse_result = ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 ++ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint); ++#else + colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); ++#endif + canvas->restore(); + break; + case FT_COLR_PAINTFORMAT_ROTATE: |