ed68634db2
9c9a711ac5"Update skia to m111" had removed the whole external/skia/missing-include.patch.0, including the part added by5877c6b118"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 at29d492b60c", 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>
29 lines
898 B
Diff
29 lines
898 B
Diff
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
|
|
|