[Libreoffice-commits] core.git: external/skia

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 26 16:54:20 UTC 2020


 external/skia/make-api-visible.patch.1 |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit fb3f5fe9360f564e6e4bf6fc819e2be4c2abb5e5
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Aug 26 17:08:12 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Aug 26 18:53:38 2020 +0200

    UBSan needs sk_app::WindowContext RTTI in Library_vcl
    
    ...as seen during CppunitTest_basic_scanner:
    
    > DynamicLibraryManagerException: "Failed to load dynamic library: workdir/LinkTarget/CppunitTest/libtest_basic_scanner.so
    > instdir/program/libvcllo.so: undefined symbol: _ZTIN6sk_app13WindowContextE"
    
    Change-Id: I7c39d19fda3cdfe51b5ccf117ffe5c6c89863258
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101410
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/skia/make-api-visible.patch.1 b/external/skia/make-api-visible.patch.1
index bb574b762f5b..6f2cd3b05a6c 100644
--- a/external/skia/make-api-visible.patch.1
+++ b/external/skia/make-api-visible.patch.1
@@ -1,3 +1,18 @@
+--- a/tools/sk_app/WindowContext.h
++++ b/tools/sk_app/WindowContext.h
+@@ -17,7 +17,11 @@
+ 
+ namespace sk_app {
+ 
+-class WindowContext {
++class
++#if defined __clang__ && !defined _MSC_VER
++__attribute__((type_visibility("default")))
++#endif
++WindowContext {
+ public:
+     WindowContext(const DisplayParams&);
+ 
 diff --git a/tools/sk_app/unix/WindowContextFactory_unix.h b/tools/sk_app/unix/WindowContextFactory_unix.h
 index 11bd2d2ac2..09c92dc417 100644
 --- a/tools/sk_app/unix/WindowContextFactory_unix.h


More information about the Libreoffice-commits mailing list