download.lst | 4 ++-- external/skia/fontconfig-get-typeface.patch.1 | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit cc0a8c75af7fe6e7012287034ecefdc6284eb460 Author: Noel Grandin <[email protected]> AuthorDate: Tue Mar 11 13:13:31 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Oct 23 14:33:19 2025 +0200 update to skia m132 dropping patch that is already upstream Change-Id: I7f0dc4b964499eb1ea6db0b32846ed9328f22ced Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182768 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 5284fbe7b4358426f4236157009dfb9e6c69a2f7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192893 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 7b148f10f99f..53cd15dbd575 100644 --- a/download.lst +++ b/download.lst @@ -709,8 +709,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 17fe9e70ba51a2873b805e2ad7617046d4b8449cde5a4d29cba353c2c1921325 -SKIA_TARBALL := skia-m131-47af57460e62268bdee4ada42e9c37999411da80.tar.xz +SKIA_SHA256SUM := 103f63a8414a506c887cfe788f7653c130df1278b2cc1d1ae6827b2b90e59377 +SKIA_TARBALL := skia-m132-ee9db7d1348f76780fd0184b9b0243d653e36411.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/fontconfig-get-typeface.patch.1 b/external/skia/fontconfig-get-typeface.patch.1 index e4f07d6c5bd6..6653b50255b5 100644 --- a/external/skia/fontconfig-get-typeface.patch.1 +++ b/external/skia/fontconfig-get-typeface.patch.1 @@ -1,10 +1,10 @@ diff -ur skia.org/include/ports/SkFontMgr_fontconfig.h skia/include/ports/SkFontMgr_fontconfig.h --- skia.org/include/ports/SkFontMgr_fontconfig.h 2024-10-09 10:25:16.421928663 +0200 +++ skia/include/ports/SkFontMgr_fontconfig.h 2024-10-09 10:27:17.914640682 +0200 -@@ -19,4 +19,9 @@ - */ +@@ -21,4 +21,9 @@ + class SkFontScanner; + SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc, std::unique_ptr<SkFontScanner> scanner); SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc); - +struct _FcPattern; +typedef struct _FcPattern FcPattern; +class SkTypeface; @@ -22,13 +22,13 @@ diff -ur skia.org/src/ports/SkFontMgr_fontconfig.cpp skia/src/ports/SkFontMgr_fo sk_sp<SkTypeface> createTypefaceFromFcPattern(SkAutoFcPattern pattern) const { if (!pattern) { return nullptr; -@@ -966,6 +967,16 @@ - } - }; +@@ -1043,6 +1044,16 @@ + return sk_make_sp<SkFontMgr_fontconfig>(fc, std::move(scanner)); + } -sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc) { +SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc) { - return sk_make_sp<SkFontMgr_fontconfig>(fc); + return sk_make_sp<SkFontMgr_fontconfig>(fc, SkFontScanner_Make_FreeType()); } + +SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const sk_sp<SkFontMgr>& mgr, FcPattern* pattern)
