Skip to content

Commit

Permalink
www/qt5-webengine: fix build with clang 14
Browse files Browse the repository at this point in the history
Fixes compile error:

In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8:
./../../../../qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition
typedef struct {
              ^
               UTextWithBuffer
./../../../../qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration
  DISALLOW_NEW();
  ^~~~~~~~~~~~~~
../../../../qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW'
 public:                                                                      \
 ^~~~~~~
./../../../../qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration
} UTextWithBuffer;
  ^

PR:		261949
Approved by:	adridg (maintainer)
MFH:		2022Q1
  • Loading branch information
DimitryAndric committed Feb 15, 2022
1 parent 03949a7 commit 0825e7b
Showing 1 changed file with 16 additions and 0 deletions.
@@ -0,0 +1,16 @@
--- src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc.orig 2020-11-07 01:22:36 UTC
+++ src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary

const int kTextBufferCapacity = 16;

-typedef struct {
+struct UTextWithBuffer {
DISALLOW_NEW();
UText text;
UChar buffer[kTextBufferCapacity];
-} UTextWithBuffer;
+};

static inline int64_t TextPinIndex(int64_t& index, int64_t limit) {
if (index < 0)

0 comments on commit 0825e7b

Please sign in to comment.