diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-04 17:06:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-04 18:39:36 +0100 |
| commit | 2914bde7e1d4a588b597e91b59b3870c26c1b3a4 (patch) | |
| tree | d31830aaf94916d148290a42a4124b54417ee9b7 /external/skia/UnpackedTarball_skia.mk | |
| parent | be3a818301a3ed1871bf6d7f57db39ddb6b67ab9 (diff) | |
external/skia: Fix -Werror=deprecated-copy-dtor
...happening when LO code includes skia files:
> vcl/skia/gdiimpl.cxx: In member function ‘void SkiaSalGraphicsImpl::createOffscreenSurface()’:
> vcl/skia/gdiimpl.cxx:246:83: error: implicitly-declared ‘sk_app::VulkanWindowContext::SharedGrContext& sk_app::VulkanWindowContext::SharedGrContext::operator=(const sk_app::VulkanWindowContext::SharedGrContext&)’ is deprecated [-Werror=deprecated-copy-dtor]
> 246 | mOffscreenGrContext = sk_app::VulkanWindowContext::getSharedGrContext();
> | ^
> In file included from vcl/inc/skia/gdiimpl.hxx:29,
> from vcl/skia/gdiimpl.cxx:20:
> workdir/UnpackedTarball/skia/tools/sk_app/VulkanWindowContext.h:35:9: note: because ‘sk_app::VulkanWindowContext::SharedGrContext’ has user-provided ‘sk_app::VulkanWindowContext::SharedGrContext::~SharedGrContext()’
> 35 | ~SharedGrContext() { shared.reset(); checkDestroyShared(); }
> | ^
See e9e4eb0736d5582fa37dcad20bf5826c50029249 "Fix some
-Werror=deprecated-copy-dtor" for details about -Wdeprecated-copy-dtor.
Change-Id: Ic393acff5c4d8e3eaa78b4dfed51626f73e95ed4
Reviewed-on: https://gerrit.libreoffice.org/84425
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/skia/UnpackedTarball_skia.mk')
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index acbd68d87c9e..84178749caed 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -24,6 +24,7 @@ skia_patches := \ share-grcontext.patch.1 \ c++20-comparison.patch.0 \ Wdeprecated-copy.patch.0 \ + Wdeprecated-copy-dtor.patch.0 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) |