external/skia/UnpackedTarball_skia.mk | 1 +
external/skia/incomplete.patch.0 | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
New commits:
commit 254b90801d4af1b775447dc701c2f0d71fcfd773
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 11 08:35:55 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jul 11 16:04:15 2023 +0200
external/skia: Fix use of incomplete type
...as reported at least with --with-latest-c++ against recent LLVM 17
libc++,
> In file included from
workdir/UnpackedTarball/skia/src/gpu/ganesh/image/GrImageUtils.cpp:8:
> In file included from
workdir/UnpackedTarball/skia/src/gpu/ganesh/image/GrImageUtils.h:12:
> In file included from
workdir/UnpackedTarball/skia/include/core/SkSamplingOptions.h:13:
> In file included from ~/llvm/inst/bin/../include/c++/v1/algorithm:1778:
> In file included from
~/llvm/inst/bin/../include/c++/v1/__algorithm/inplace_merge.h:28:
> ~/llvm/inst/bin/../include/c++/v1/__memory/unique_ptr.h:66:19: error:
invalid application of 'sizeof' to an incomplete type 'GrFragmentProcessor'
> 66 | static_assert(sizeof(_Tp) >= 0, "cannot delete an incomplete
type");
> | ^~~~~~~~~~~
> ~/llvm/inst/bin/../include/c++/v1/__memory/unique_ptr.h:300:7: note: in
instantiation of member function
'std::default_delete<GrFragmentProcessor>::operator()' requested here
> 300 | __ptr_.second()(__tmp);
> | ^
> ~/llvm/inst/bin/../include/c++/v1/__memory/unique_ptr.h:266:75: note: in
instantiation of member function 'std::unique_ptr<GrFragmentProcessor>::reset'
requested here
> 266 | _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
~unique_ptr() { reset(); }
> |
^
> workdir/UnpackedTarball/skia/src/gpu/ganesh/image/GrImageUtils.h:106:12:
note: in instantiation of member function
'std::unique_ptr<GrFragmentProcessor>::~unique_ptr' requested here
> 106 | return AsFragmentProcessor(ctx, img.get(), opt, tm, m,
subset, domain);
> | ^
> workdir/UnpackedTarball/skia/src/gpu/ganesh/SkGr.h:32:7: note: forward
declaration of 'GrFragmentProcessor'
> 32 | class GrFragmentProcessor;
> | ^
Change-Id: I181f7416c80fd97c505359f275dd61f69ee27ef8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154291
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index f6e97fb899e2..f4562ca31374 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -38,6 +38,7 @@ skia_patches := \
redefinition-of-op.patch.0 \
0001-Added-missing-include-cstdio.patch \
fix-SkDebugf-link-error.patch.1 \
+ incomplete.patch.0 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/incomplete.patch.0 b/external/skia/incomplete.patch.0
new file mode 100644
index 000000000000..f8450b1c1da2
--- /dev/null
+++ b/external/skia/incomplete.patch.0
@@ -0,0 +1,18 @@
+--- src/gpu/ganesh/image/GrImageUtils.h
++++ src/gpu/ganesh/image/GrImageUtils.h
+@@ -12,6 +12,7 @@
+ #include "include/core/SkSamplingOptions.h"
+ #include "include/core/SkYUVAPixmaps.h"
+ #include "include/gpu/GrTypes.h"
++#include "src/gpu/ganesh/GrFragmentProcessor.h"
+ #include "src/gpu/ganesh/GrSurfaceProxyView.h" // IWYU pragma: keep
+ #include "src/gpu/ganesh/SkGr.h"
+
+@@ -21,7 +22,6 @@
+ #include <tuple>
+
+ class GrCaps;
+-class GrFragmentProcessor;
+ class GrImageContext;
+ class GrRecordingContext;
+ class SkImage;
