diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-30 18:39:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-30 22:02:33 +0000 |
| commit | ed68634db25103cd7d2adc29f3973f80fbaec324 (patch) | |
| tree | b2d375e717663b3bc8af5be8137020fb3837d85b /external/skia | |
| parent | 82ee2d6184a59ef4470c12bddeff03cd68d946e4 (diff) | |
external/skia: Still missing include
9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 "Update skia to m111" had removed the
whole external/skia/missing-include.patch.0, including the part added by
5877c6b118c99c9ec807a111471bfd67720a5086 "external/skia: Missing include" (for
snprintf in
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h),
even though at least my GCC 13 trunk build still requires that. However, the
comment at
<https://gerrit.libreoffice.org/c/core/+/145552/2#message-7fad3bfd39568500aa66b1c03dfd1670dad636f2>
"external/skia: Missing include" pointed out that this "landed upstream at
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c84ca784ea0943efc7d2e6e0f3bdaac",
so switch to using a git-format-patch of that (slightly hand-edited to fix up
the path of that project's vk_mem_alloc.h as included in the Skia tarball, and
to cater for that file's usage of CRLF line endings).
Change-Id: I31192b6e0aaf355d5cfee96badc59903ab592aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146365
Reviewed-by: Sam James <sam@gentoo.org>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/skia')
| -rw-r--r-- | external/skia/0001-Added-missing-include-cstdio.patch | 29 | ||||
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/external/skia/0001-Added-missing-include-cstdio.patch b/external/skia/0001-Added-missing-include-cstdio.patch new file mode 100644 index 000000000000..cfe2ffdb0bd8 --- /dev/null +++ b/external/skia/0001-Added-missing-include-cstdio.patch @@ -0,0 +1,29 @@ +From 29d492b60c84ca784ea0943efc7d2e6e0f3bdaac Mon Sep 17 00:00:00 2001 +From: Adam Sawicki <adam.sawicki@amd.com> +Date: Thu, 19 Jan 2023 13:19:55 +0100 +Subject: [PATCH] Added missing #include <cstdio> + +For snprintf, for compatibility with GCC 13. +Fixes #312 - thanks @marxin ! +--- + include/vk_mem_alloc.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h +index b787c36..0fe459b 100644 +--- a/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h ++++ b/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h +@@ -2614,6 +2614,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + #include <bit> // For std::popcount
+ #endif
+
++#if VMA_STATS_STRING_ENABLED
++ #include <cstdio> // For snprintf
++#endif
++
+ /*******************************************************************************
+ CONFIGURATION SECTION
+
+-- +2.39.1 + diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index cb4238acaefc..cafc7a9df3b8 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -38,6 +38,7 @@ skia_patches := \ constexpr-template.patch.0 \ tdf147342.patch.0 \ redefinition-of-op.patch.0 \ + 0001-Added-missing-include-cstdio.patch \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) |