download.lst | 4 ++-- external/skia/share-grcontext.patch.1 | 2 +- vcl/skia/SkiaHelper.cxx | 2 +- vcl/skia/gdiimpl.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit d6b3a3b58b0443ac26e035572339fc29fde00cb7 Author: Noel Grandin <[email protected]> AuthorDate: Mon Mar 10 15:48:39 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Oct 23 14:32:56 2025 +0200 update to skia m131 Change-Id: If300d83a61389d19371d153a399eea10c2d87dd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182739 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 8c74df27aad015eec75c24306904c8c73f3ab4f5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192892 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/download.lst b/download.lst index b2f1dece361c..7b148f10f99f 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 := 53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d -SKIA_TARBALL := skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz +SKIA_SHA256SUM := 17fe9e70ba51a2873b805e2ad7617046d4b8449cde5a4d29cba353c2c1921325 +SKIA_TARBALL := skia-m131-47af57460e62268bdee4ada42e9c37999411da80.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/share-grcontext.patch.1 b/external/skia/share-grcontext.patch.1 index 20f410b48bc9..20e0db4b863d 100644 --- a/external/skia/share-grcontext.patch.1 +++ b/external/skia/share-grcontext.patch.1 @@ -793,7 +793,7 @@ diff -ur skia.org/tools/window/WindowContext.h skia/tools/window/WindowContext.h #include "include/core/SkRefCnt.h" #include "include/core/SkSurfaceProps.h" #include "include/gpu/ganesh/GrTypes.h" -+#include "include/gpu/GrDirectContext.h" ++#include "include/gpu/ganesh/GrDirectContext.h" #include "tools/window/DisplayParams.h" -class GrDirectContext; diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index b8e9f7a89373..fdff5e464380 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -51,7 +51,7 @@ bool isAlphaMaskBlendingEnabled() { return false; } #include <SkPaint.h> #include <SkSurface.h> #include <SkGraphics.h> -#include <GrDirectContext.h> +#include <ganesh/GrDirectContext.h> #include <SkRuntimeEffect.h> #include <SkStream.h> #include <SkTileMode.h> diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index f8a0ed1bf693..de46b67ef073 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -37,7 +37,7 @@ #include <SkRegion.h> #include <SkPathEffect.h> #include <SkDashPathEffect.h> -#include <GrBackendSurface.h> +#include <ganesh/GrBackendSurface.h> #include <SkTextBlob.h> #include <SkRSXform.h>
