libsoup3: update to 3.6.0; fix GTK2/3 app startup
[oi-userland.git] / components / desktop / libreoffice / patches / 20-skia-illumos-no-malloc-usable-size.patch
blob02851436e28174ef9669d50df026886e8d4b02ae
1 diff -Naur libreoffice-7.6.0.0.beta1/external/skia.old/illumos-no-malloc-usable-size.patch libreoffice-7.6.0.0.beta1/external/skia/illumos-no-malloc-usable-size.patch
2 --- libreoffice-7.6.0.0.beta1/external/skia.old/illumos-no-malloc-usable-size.patch 1969-12-31 19:00:00.000000000 -0500
3 +++ libreoffice-7.6.0.0.beta1/external/skia/illumos-no-malloc-usable-size.patch 2023-06-21 16:43:40.798954904 -0400
4 @@ -0,0 +1,11 @@
5 +--- skia/src/base/SkContainers.cpp.old 2023-06-21 16:39:34.295412401 -0400
6 ++++ skia/src/base/SkContainers.cpp 2023-06-21 16:39:55.779378998 -0400
7 +@@ -38,7 +38,7 @@
8 + #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17
9 + completeSize = malloc_usable_size(ptr);
10 + SkASSERT(completeSize >= size);
11 +- #elif defined(SK_BUILD_FOR_UNIX)
12 ++ #elif defined(SK_BUILD_FOR_UNIX) && !defined(__illumos__)
13 + completeSize = malloc_usable_size(ptr);
14 + SkASSERT(completeSize >= size);
15 + #elif defined(SK_BUILD_FOR_WIN)
16 --- core-589fb36b663cbd68afc26419629a4a95bd593a89/external/skia/UnpackedTarball_skia.mk.old 2024-04-17 20:09:39.075636787 -0400
17 +++ core-589fb36b663cbd68afc26419629a4a95bd593a89/external/skia/UnpackedTarball_skia.mk 2024-04-17 20:10:24.339870077 -0400
18 @@ -42,6 +42,7 @@
19 0001-AvoidCombiningExtrememelyLargeMeshes.patch.1 \
20 sort-comparison-assumption.patch.0 \
21 help-msvc-analyzer.patch \
22 + illumos-no-malloc-usable-size.patch \
24 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))