commit: 3af59f2e245c41373d5dbc50086705984f1aaabd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 23 23:38:08 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Oct 23 23:38:08 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3af59f2e
dev-qt/qtwebengine: Fix build against ICU-65 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/qtwebengine-5.13.1-icu-65.patch | 41 ++++++++++++++++++++++ .../qtwebengine-5.13.1-no-kcrash-reporting.patch | 2 +- dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 1 + 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch new file mode 100644 index 00000000..b5df6c8f --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch @@ -0,0 +1,41 @@ +From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001 +From: Kirill Burtsev <kirill.burt...@qt.io> +Date: Fri, 23 Aug 2019 15:09:25 +0200 +Subject: Fix compilation with system ICU + +1. system_icu_config is missing default type for UCHAR_TYPE, that causes +a mismatch of types all over Chromium. uint16_t is defined as a base type +under linux in chromium/build/linux/unbundle/icu.gn. +Necessary constructions were lost during recent refactorings, +and seems to be restored in later chromium > 77. + +2. Update shim headers + +3. 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 <chii...@gentoo.org> +Reviewed-by: Allan Sandfeld Jensen <allan.jen...@qt.io> +--- + .../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/files/qtwebengine-5.13.1-no-kcrash-reporting.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch index 477e0f50..6f66c262 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch @@ -15,4 +15,4 @@ Signed-off-by: Nicholas Meyer <nickaristocra...@gmail.com> + base::FEATURE_DISABLED_BY_DEFAULT}; // Enables specification of a target element in the fragment identifier - // via a CSS selector. \ No newline at end of file + // via a CSS selector. diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild index 59976932..c6a04c51 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild @@ -80,6 +80,7 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960 + "${FILESDIR}/${P}-icu-65.patch" # QTBUG-76963, 5.13 branch: "${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch" # bug 693668, upstream(?) TODO:
