external/skia/UnpackedTarball_skia.mk | 1 -
external/skia/clang11-flax-vector-conversion.patch.0 | 11 -----------
2 files changed, 12 deletions(-)
New commits:
commit 06b7a31cbe971470b5551044efc6c977b44bc312
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 2 20:45:31 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Oct 6 02:44:39 2023 +0200
Drop some patches for old Clang
There are no longer needed after 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441
"Adapt Clang and GCC minimum version checks"
Change-Id: Id428e2d50a120fe65738e7ba019c4f2c22095f48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157491
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index b931aefd8618..ae90f26fe15b 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -18,7 +18,6 @@ skia_patches := \
no-trace-resources-on-exit.patch.1 \
fix-alpha-difference-copy.patch.1 \
share-grcontext.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 \
diff --git a/external/skia/clang11-flax-vector-conversion.patch.0
b/external/skia/clang11-flax-vector-conversion.patch.0
deleted file mode 100644
index aebe66c907d6..000000000000
--- a/external/skia/clang11-flax-vector-conversion.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/opts/SkRasterPipeline_opts.h
-+++ src/opts/SkRasterPipeline_opts.h
-@@ -43,7 +43,7 @@
-
- using NoCtx = const void*;
-
--#if !defined(__clang__)
-+#if !defined(__clang__) || __clang_major__ >= 11
- #define JUMPER_IS_SCALAR
- #elif defined(SK_ARM_HAS_NEON)
- #define JUMPER_IS_NEON
