external/skia/UnpackedTarball_skia.mk | 1 + external/skia/missing-include.patch.0 | 10 ++++++++++ 2 files changed, 11 insertions(+)
New commits: commit c52565f5092393f10c25b67ead2ba8a8df279885 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Oct 26 08:06:01 2022 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Jan 31 14:50:09 2023 +0000 external/skia: Missing include ...at least when building with Visual Studio 2022 Preview 17.4.0, > In file included from workdir/UnpackedTarball/skia/src/core/SkKeyHelpers.cpp:14: > workdir/UnpackedTarball/skia\src/core/SkShaderCodeDictionary.h(45,43): error: no type named 'string' in namespace 'std' > using GenerateGlueCodeForEntry = std::string (*)(const std::string& resultName, > ~~~~~^ etc. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141833 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 3e009159cd1801507f6e965444a7dade5497f89a) Conflicts: external/skia/UnpackedTarball_skia.mk Change-Id: Idd8dafb4e57e04088ee60954ecfa601cc7588e55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146382 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 7670b7798fbd..f88cb371d65c 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -38,6 +38,7 @@ skia_patches := \ allow-no-es2restrictions.patch.1 \ vk_mem_alloc.patch.1 \ tdf148624.patch.1 \ + missing-include.patch.0 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/missing-include.patch.0 b/external/skia/missing-include.patch.0 new file mode 100644 index 000000000000..6b15e87590b5 --- /dev/null +++ b/external/skia/missing-include.patch.0 @@ -0,0 +1,10 @@ +--- src/core/SkShaderCodeDictionary.h ++++ src/core/SkShaderCodeDictionary.h +@@ -9,6 +9,7 @@ + #define SkShaderCodeDictionary_DEFINED + + #include <array> ++#include <string> + #include <unordered_map> + #include <vector> + #include "include/core/SkSpan.h"
