From d0b17dbd7e96387ee5a4041d33bb0cf48cdebb8a Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 20 Jan 2024 04:40:34 +0800 Subject: [PATCH] [skia] Fixes build error on x64-linux (#36236) --- ports/skia/add-cstdlib.patch | 12 ++++++++++++ ports/skia/portfile.cmake | 1 + ports/skia/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/skia.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/skia/add-cstdlib.patch diff --git a/ports/skia/add-cstdlib.patch b/ports/skia/add-cstdlib.patch new file mode 100644 index 0000000000..9c7c1655b9 --- /dev/null +++ b/ports/skia/add-cstdlib.patch @@ -0,0 +1,12 @@ +diff --git a/src/dawn/common/Mutex.cpp b/src/dawn/common/Mutex.cpp +index b8b891f..84c47af 100644 +--- a/src/dawn/common/Mutex.cpp ++++ b/src/dawn/common/Mutex.cpp +@@ -13,6 +13,7 @@ + // limitations under the License. + + #include "dawn/common/Mutex.h" ++#include + + namespace dawn { + Mutex::~Mutex() = default; diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 77e22253c6..bdcfd94ea4 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -30,6 +30,7 @@ declare_external_from_git(dawn LICENSE_FILE LICENSE PATCHES dawn-dedup-native-proc-gen.patch + add-cstdlib.patch ) declare_external_from_git(dng_sdk URL "https://android.googlesource.com/platform/external/dng_sdk.git" diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 5fef98a364..8be0e9251e 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "0.38.2", - "port-version": 3, + "port-version": 4, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/versions/baseline.json b/versions/baseline.json index 67466f5f6a..1d9935e905 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7986,7 +7986,7 @@ }, "skia": { "baseline": "0.38.2", - "port-version": 3 + "port-version": 4 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 4733a4c6ce..60cceb6a08 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b33b637ea6bf1d04acc4aac659b0238f9d16a0c1", + "version": "0.38.2", + "port-version": 4 + }, { "git-tree": "35eec017ed472e7061cc38768bb4aa9168464332", "version": "0.38.2",