external/skia/UnpackedTarball_skia.mk | 1 +
external/skia/ubsan-missing-typeinfo.patch.1 | 12 ++++++++++++
2 files changed, 13 insertions(+)
New commits:
commit e2dc9b2d8404ac467bb74b5db423c84a249381bb
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 12 12:20:56 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jul 12 14:36:31 2023 +0200
fix missing typeinfo for SkImage_Base in ubsan build
Change-Id: Ic17d45a93f521920fb45fbc5e88819b65638b4a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154351
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index f4562ca31374..b93328463076 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -39,6 +39,7 @@ skia_patches := \
0001-Added-missing-include-cstdio.patch \
fix-SkDebugf-link-error.patch.1 \
incomplete.patch.0 \
+ ubsan-missing-typeinfo.patch.1 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/ubsan-missing-typeinfo.patch.1
b/external/skia/ubsan-missing-typeinfo.patch.1
new file mode 100644
index 000000000000..3e88bc0cc491
--- /dev/null
+++ b/external/skia/ubsan-missing-typeinfo.patch.1
@@ -0,0 +1,12 @@
+diff -ur skia.org/src/image/SkImage_Base.h skia/src/image/SkImage_Base.h
+--- skia.org/src/image/SkImage_Base.h 2023-07-12 10:59:47.006358109 +0200
++++ skia/src/image/SkImage_Base.h 2023-07-12 11:15:00.028292134 +0200
+@@ -44,7 +44,7 @@
+
+ namespace skgpu { namespace graphite { class Recorder; } }
+
+-class SkImage_Base : public SkImage {
++class SK_API SkImage_Base : public SkImage {
+ public:
+ ~SkImage_Base() override;
+
