office-gobmx/external/skia/always_inline_and_multiversioning_conflict.patch.1

diff -ur skia.org/src/opts/SkOpts_SetTarget.h skia/src/opts/SkOpts_SetTarget.h
--- skia.org/src/opts/SkOpts_SetTarget.h	2024-10-07 14:32:40.495792300 +0200
+++ skia/src/opts/SkOpts_SetTarget.h	2024-10-07 14:45:58.375485000 +0200
@@ -58,6 +58,8 @@
     // Each of the specific intrinsic headers also checks to ensure that immintrin.h has been
     // included, so do that here, first.
     #if defined(__clang__) && defined(_MSC_VER)
+        // workaround for https://github.com/llvm/llvm-project/issues/95133
+        #define __RTMINTRIN_H
         #include <immintrin.h>
     #endif
update to skia m118 The following patch appears to be upstreamed now 0001-AvoidCombiningExtrememelyLargeMeshes.patch.1 Add a patch to deal with a clang issue that only shows up when building for 32-bit Windows. The issue is reported upstream, but there is only a workaround so far, no fix. Change-Id: I1c50019a2afe39d245c6b02243789752e84445a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174585 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2024-10-07 03:53:27 -05:00			`diff -ur skia.org/src/opts/SkOpts_SetTarget.h skia/src/opts/SkOpts_SetTarget.h`
			`--- skia.org/src/opts/SkOpts_SetTarget.h 2024-10-07 14:32:40.495792300 +0200`
			`+++ skia/src/opts/SkOpts_SetTarget.h 2024-10-07 14:45:58.375485000 +0200`
			`@@ -58,6 +58,8 @@`
			`// Each of the specific intrinsic headers also checks to ensure that immintrin.h has been`
			`// included, so do that here, first.`
			`#if defined(__clang__) && defined(_MSC_VER)`
			`+ // workaround for https://github.com/llvm/llvm-project/issues/95133`
			`+ #define __RTMINTRIN_H`
			`#include <immintrin.h>`
			`#endif`