diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-12 12:20:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-12 14:36:31 +0200 |
| commit | e2dc9b2d8404ac467bb74b5db423c84a249381bb (patch) | |
| tree | 24ef7d12f63a4499e517d4d3caeae8dee87e83d2 /external | |
| parent | 375d423573cf237fb082ed2b4908d8067036d8b2 (diff) | |
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.grandin@collabora.co.uk>
Diffstat (limited to 'external')
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 | ||||
| -rw-r--r-- | external/skia/ubsan-missing-typeinfo.patch.1 | 12 |
2 files changed, 13 insertions, 0 deletions
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; + |