From 58994f5c9f648aa3f8d05786b3339d1ad6c53951 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 25 Oct 2019 02:37:51 +0200 Subject: [PATCH] dev-qt/qtwebengine: Fix build against ICU-65 Tested-by: Jimi Huotari Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- .../files/qtwebengine-5.12.5-icu-65.patch | 33 +++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild | 1 + 2 files changed, 34 insertions(+) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch new file mode 100644 index 000000000000..d7fdaebdb664 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch @@ -0,0 +1,33 @@ +From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001 +From: Kirill Burtsev +Date: Fri, 23 Aug 2019 15:09:25 +0200 +Subject: Fix compilation with system ICU + +ICU upstream now requires that ICU4C API macros are used with a +trailing semicolon. + +- https://unicode-org.atlassian.net/browse/ICU-20601 +- https://github.com/unicode-org/icu/pull/759 + +Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b +Fixes: QTBUG-78911 +Reviewed-by: Jimi Huotari +Reviewed-by: Allan Sandfeld Jensen +--- + .../blink/renderer/core/dom/document.cc | 2 +- + chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++------- + 2 files changed, 21 insertions(+), 9 deletions(-) + +diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc +index 920dab7c48d..43fd422393c 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc +@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (c == ':') { + if (saw_colon) + return ParseQualifiedNameResult(kQNMultipleColons); diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild index 7809c2d12c00..f646cfa81f95 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild @@ -81,6 +81,7 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 "${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960 + "${FILESDIR}/${P}-icu-65.patch" ) src_prepare() { -- 2.26.2