diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-27 14:01:15 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-11-27 14:13:38 +0100 |
| commit | 73d3bb1c581d8a2d95fef8e082350d62f6c3a448 (patch) | |
| tree | 7dc3713650ba428da3e739214006e970071c4089 /external | |
| parent | 59ef53fb95b19a22dd1d761a277809f3aff3fb2c (diff) | |
external/skia: -Werror,-Wdeprecated-copy
> In file included from vcl/skia/gdiimpl.cxx:20:
> In file included from vcl/inc/skia/gdiimpl.hxx:28:
> In file included from workdir/UnpackedTarball/skia/include/core/SkSurface.h:13:
> workdir/UnpackedTarball/skia/include/core/SkSurfaceProps.h:66:5: error: definition of implicit copy assignment operator for 'SkSurfaceProps' is deprecated because it has a user-declared copy constructor [-Werror,-Wdeprecated-copy]
> SkSurfaceProps(const SkSurfaceProps& other);
> ^
> workdir/UnpackedTarball/skia/tools/sk_app/DisplayParams.h:16:8: note: in implicit copy assignment operator for 'SkSurfaceProps' first required here
> struct DisplayParams {
> ^
> workdir/UnpackedTarball/skia/tools/sk_app/VulkanWindowContext.h:57:24: note: in implicit copy assignment operator for 'sk_app::DisplayParams' first required here
> fDisplayParams = params;
> ^
with recent Clang 10 trunk, similar to ae71a0adef64b292ab01194817d2d763f7c85433
"Remove some redundantly user-declared copy ctors and assignment ops"
Change-Id: I71263d8b3725478afc3a72f6f3ee9d73a277a8fd
Reviewed-on: https://gerrit.libreoffice.org/83907
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 | ||||
| -rw-r--r-- | external/skia/Wdeprecated-copy.patch.0 | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 22a1a0d40720..acbd68d87c9e 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -23,6 +23,7 @@ skia_patches := \ libvulkan-name.patch.1 \ share-grcontext.patch.1 \ c++20-comparison.patch.0 \ + Wdeprecated-copy.patch.0 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/Wdeprecated-copy.patch.0 b/external/skia/Wdeprecated-copy.patch.0 new file mode 100644 index 000000000000..4e0682bcebd9 --- /dev/null +++ b/external/skia/Wdeprecated-copy.patch.0 @@ -0,0 +1,24 @@ +--- include/core/SkSurfaceProps.h ++++ include/core/SkSurfaceProps.h +@@ -63,7 +63,6 @@ + }; + SkSurfaceProps(InitType); + SkSurfaceProps(uint32_t flags, InitType); +- SkSurfaceProps(const SkSurfaceProps& other); + + uint32_t flags() const { return fFlags; } + SkPixelGeometry pixelGeometry() const { return fPixelGeometry; } +--- src/image/SkSurface.cpp ++++ src/image/SkSurface.cpp +@@ -52,11 +52,6 @@ + : fFlags(flags), fPixelGeometry(pg) + {} + +-SkSurfaceProps::SkSurfaceProps(const SkSurfaceProps& other) +- : fFlags(other.fFlags) +- , fPixelGeometry(other.fPixelGeometry) +-{} +- + /////////////////////////////////////////////////////////////////////////////// + + SkSurface_Base::SkSurface_Base(int width, int height, const SkSurfaceProps* props) |