1 files changed, 15 insertions, 12 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index e1ea21b3cd35..9e603dcb28dd 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -11,34 +11,37 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,skia))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,skia,$(SKIA_TARBALL)))
 
-# * c++20.patch.0 has been reported upstream at
-#   <https://groups.google.com/forum/#!topic/skia-discuss/pYZQq_sLnv8> "C++20 operator== issue":
 skia_patches := \
     fix-pch.patch.1 \
     fix-ddi.patch \
     make-api-visible.patch.1 \
     no-trace-resources-on-exit.patch.1 \
     fix-alpha-difference-copy.patch.1 \
-    libvulkan-name.patch.1 \
     share-grcontext.patch.1 \
-    fix-gcc-x86.patch.1	\
-    clang11-flax-vector-conversion.patch.0 \
     clang-attributes-warning.patch.1 \
     fontconfig-get-typeface.patch.0 \
     windows-do-not-modify-logfont.patch.0 \
     windows-text-gamma.patch.0 \
     windows-force-unicode-api.patch.0 \
-    fix-without-gl.patch.0 \
+    fix-without-gl.patch.1 \
     windows-typeface-directwrite.patch.0 \
     windows-raster-surface-no-copies.patch.1 \
     fix-windows-dwrite.patch.1 \
-    c++20.patch.0 \
-    constexpr-debug-std-max.patch.1 \
     swap-buffers-rect.patch.1 \
-    ubsan.patch.0 \
-    fast-png-write.patch.1 \
-    skia_sk_cpu_sse_level_0_by_default.patch.1 \
+    ubsan.patch.1 \
     fix-warnings.patch.1 \
+    windows-libraries-system32.patch.1 \
+    allow-no-es2restrictions.patch.1 \
+    vk_mem_alloc.patch.1 \
+    tdf147342.patch.0 \
+    redefinition-of-op.patch.0 \
+    0001-Added-missing-include-cstdio.patch \
+    fix-SkDebugf-link-error.patch.1 \
+    incomplete.patch.0 \
+    ubsan-missing-typeinfo.patch.1 \
+    incomplete-type-SkImageGenerator.patch.1 \
+    0001-AvoidCombiningExtrememelyLargeMeshes.patch.1 \
+    sort-comparison-assumption.patch.0 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
@@ -47,7 +50,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,skia,\
 ))
 
 $(eval $(call gb_UnpackedTarball_set_post_action,skia,\
-    mv third_party/skcms/skcms.cc third_party/skcms/skcms.cpp \
+    mv modules/skcms/skcms.cc modules/skcms/skcms.cpp \
 ))
 
 # vim: set noet sw=4 ts=4: