mirror of
https://github.com/LibreOffice/core.git
synced 2025-07-22 01:09:00 +00:00
update to skia m135
Change-Id: I61bb92770b1204c0f6abaae355c5905028c5cc46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182842 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
This commit is contained in:
@ -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
|
||||
|
@ -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;
|
||||
|
6
external/skia/fix-pch.patch.1
vendored
6
external/skia/fix-pch.patch.1
vendored
@ -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,
|
||||
|
Reference in New Issue
Block a user