diff --git a/download.lst b/download.lst index 10f7916b2b3d..0e643421e67c 100644 --- a/download.lst +++ b/download.lst @@ -631,8 +631,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := f2b3a580da1842d8b89b36ce37ead05f980a5fe67d5fd0d5b1e328faf47360f1 -SKIA_TARBALL := skia-m134-fb519f2fe5d4409bc0033a4ae00ab9a7095fe566.tar.xz +SKIA_SHA256SUM := 4ba927b41e79ceb9d426474988290e08788854a9158b474ab96e7d024c717291 +SKIA_TARBALL := skia-m135-6c2dc3e74ea0bd464ba1c6679ded0b643101e682.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/allow-no-es2restrictions.patch.1 b/external/skia/allow-no-es2restrictions.patch.1 index ea2dd02191f6..a13c37f1c54d 100644 --- a/external/skia/allow-no-es2restrictions.patch.1 +++ b/external/skia/allow-no-es2restrictions.patch.1 @@ -2,10 +2,10 @@ diff --git a/include/effects/SkRuntimeEffect.h b/include/effects/SkRuntimeEffect index e424910b34..cee7794d3a 100644 --- a/include/effects/SkRuntimeEffect.h +++ b/include/effects/SkRuntimeEffect.h -@@ -108,7 +108,7 @@ public: - // painted.) - bool forceUnoptimized = false; - +@@ -129,7 +129,7 @@ public: + // When possible this name will be used to identify the created runtime effect. + std::string_view fName; + - private: +// private: friend class SkRuntimeEffect; diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1 index e64ac72fea4e..a922a961a533 100644 --- a/external/skia/fix-pch.patch.1 +++ b/external/skia/fix-pch.patch.1 @@ -1,6 +1,6 @@ -diff -ur skia.org/include/private/SkColorData.h skia/include/private/SkColorData.h ---- skia.org/include/private/SkColorData.h 2024-10-10 13:25:03.614133252 +0200 -+++ skia/include/private/SkColorData.h 2024-10-10 13:25:12.144187524 +0200 +diff -ur skia.org/src/core/SkColorData.h skia/src/core/SkColorData.h +--- skia.org/src/core/SkColorData.h 2024-10-10 13:25:03.614133252 +0200 ++++ skia/src/core/SkColorData.h 2024-10-10 13:25:12.144187524 +0200 @@ -382,4 +382,6 @@ SK_FloatNegativeInfinity, SK_FloatNegativeInfinity,