From fac4406e3a60ea1a2d3cb971371c02353be7b02d Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Fri, 4 Jul 2025 10:55:31 +0200 Subject: [PATCH] skia: fix build /home/julien/lo/libreoffice/workdir/UnpackedTarball/skia/tools/window/VulkanWindowContext.cpp:520:24: error: no member named 'fDestroyDebugUtilsMessengerEXT' in 'skwindow::internal::VulkanWindowContext::Shared' 520 | fGlobalShared->fDestroyDebugUtilsMessengerEXT(fGlobalShared->fInstance, fGlobalShared->fDebugMessenger, nullptr); | ~~~^ 1 error generated. after commit 027c65e72e49c1c5dae9d6b5f8151cd2d27442a7 Author: Xisco Fauli Date: Wed Jul 2 14:31:20 2025 +0200 skia: upgrade to m139 Change-Id: I8413d320733208628b773ea192c9df65c9f03989 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187374 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- external/skia/share-grcontext.patch.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/skia/share-grcontext.patch.1 b/external/skia/share-grcontext.patch.1 index c3a984cb48d2..ae193ba290c2 100644 --- a/external/skia/share-grcontext.patch.1 +++ b/external/skia/share-grcontext.patch.1 @@ -339,7 +339,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW + GET_PROC_GLOBAL(DestroyInstance); + GET_DEV_PROC_GLOBAL(DestroyDevice); + if (fGlobalShared->fDebugMessenger != VK_NULL_HANDLE) { -+ GET_PROC_GLOBAL(DestroyDebugReportCallbackEXT); ++ GET_PROC_GLOBAL(DestroyDebugUtilsMessengerEXT); } + + backendContext.fMemoryAllocator = @@ -744,7 +744,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.h skia/tools/window/VulkanWin + { + PFN_vkDestroyInstance fDestroyInstance = nullptr; + PFN_vkDestroyDevice fDestroyDevice = nullptr; -+ PFN_vkDestroyDebugReportCallbackEXT fDestroyDebugReportCallbackEXT = nullptr; ++ PFN_vkDestroyDebugUtilsMessengerEXT fDestroyDebugUtilsMessengerEXT = nullptr; + + VkInstance fInstance = VK_NULL_HANDLE; + VkPhysicalDevice fPhysicalDevice = VK_NULL_HANDLE;