| 1 |
commit: 8d42cc5a68b1abca413483e3906b04e6ccfa0a15 |
| 2 |
Author: Miezhiko <Miezhiko <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Apr 4 11:40:05 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 5 17:01:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8d42cc5a |
| 7 |
|
| 8 |
dev-qt/qtwebengine: fix building with clang 14 |
| 9 |
|
| 10 |
Signed-off-by: Miezhiko <Miezhiko <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/24897 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/qtwebengine-5.15.3_p20220329-clang14.patch | 16 ++++++++++++++++ |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 1 + |
| 16 |
2 files changed, 17 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000..ed48544f |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc |
| 25 |
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc |
| 26 |
+@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary |
| 27 |
+ |
| 28 |
+ const int kTextBufferCapacity = 16; |
| 29 |
+ |
| 30 |
+-typedef struct { |
| 31 |
++struct UTextWithBuffer { |
| 32 |
+ DISALLOW_NEW(); |
| 33 |
+ UText text; |
| 34 |
+ UChar buffer[kTextBufferCapacity]; |
| 35 |
+-} UTextWithBuffer; |
| 36 |
++}; |
| 37 |
+ |
| 38 |
+ static inline int64_t TextPinIndex(int64_t& index, int64_t limit) { |
| 39 |
+ if (index < 0) |
| 40 |
|
| 41 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild |
| 42 |
index 8c44a498..53315490 100644 |
| 43 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild |
| 44 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild |
| 45 |
@@ -107,6 +107,7 @@ PATCHES=( |
| 46 |
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix |
| 47 |
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746 |
| 48 |
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957 |
| 49 |
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # fixes build with clang 14 |
| 50 |
) |
| 51 |
|
| 52 |
qtwebengine_check-reqs() { |
Archives