LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-26 15:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to skia m135

Browse Source 
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:
Noel Grandin
2025-03-12 21:12:31 +02:00
parent 04a25a4759
commit 6cdb6fea31
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
download.lst
View File

@ -631,8 +631,8 @@ RHINO_TARBALL := rhino-1.7.15.zip
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts
SKIA_SHA256SUM := f2b3a580da1842d8b89b36ce37ead05f980a5fe67d5fd0d5b1e328faf47360f1 SKIA_SHA256SUM := 4ba927b41e79ceb9d426474988290e08788854a9158b474ab96e7d024c717291
SKIA_TARBALL := skia-m134-fb519f2fe5d4409bc0033a4ae00ab9a7095fe566.tar.xz SKIA_TARBALL := skia-m135-6c2dc3e74ea0bd464ba1c6679ded0b643101e682.tar.xz
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts

8
external/skia/allow-no-es2restrictions.patch.1 vendored
View File

@ -2,10 +2,10 @@ diff --git a/include/effects/SkRuntimeEffect.h b/include/effects/SkRuntimeEffect
index e424910b34..cee7794d3a 100644 index e424910b34..cee7794d3a 100644
--- a/include/effects/SkRuntimeEffect.h --- a/include/effects/SkRuntimeEffect.h
+++ b/include/effects/SkRuntimeEffect.h +++ b/include/effects/SkRuntimeEffect.h
@@ -108,7 +108,7 @@ public: @@ -129,7 +129,7 @@ public:
// painted.) // When possible this name will be used to identify the created runtime effect.
bool forceUnoptimized = false; std::string_view fName;
- private: - private:
+// private: +// private:
friend class SkRuntimeEffect; friend class SkRuntimeEffect;

6
external/skia/fix-pch.patch.1 vendored
View File

@ -1,6 +1,6 @@
diff -ur skia.org/include/private/SkColorData.h skia/include/private/SkColorData.h diff -ur skia.org/src/core/SkColorData.h skia/src/core/SkColorData.h
--- skia.org/include/private/SkColorData.h 2024-10-10 13:25:03.614133252 +0200 --- skia.org/src/core/SkColorData.h 2024-10-10 13:25:03.614133252 +0200
+++ skia/include/private/SkColorData.h 2024-10-10 13:25:12.144187524 +0200 +++ skia/src/core/SkColorData.h 2024-10-10 13:25:12.144187524 +0200
@@ -382,4 +382,6 @@ @@ -382,4 +382,6 @@
SK_FloatNegativeInfinity, SK_FloatNegativeInfinity,
SK_FloatNegativeInfinity, SK_FloatNegativeInfinity,