* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-04-26 15:03 99% Jimi Huotari
0 siblings, 0 replies; 1+ results
From: Jimi Huotari @ 2022-04-26 15:03 UTC (permalink / raw
To: gentoo-commits
commit: ce687067d9fd189ca0faab3c31dc5b8f4db0d00f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 14:59:32 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 14:59:32 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ce687067
dev-qt/qtwebengine: fix 6.3.0 build with system-icu
Closes: https://bugs.gentoo.org/838742
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../files/qtwebengine-6.3.0-system-icu.patch | 38 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild | 2 ++
2 files changed, 40 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
new file mode 100644
index 00000000..1cb94de2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
@@ -0,0 +1,38 @@
+From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Thu, 31 Mar 2022 19:45:39 +0200
+Subject: [FIXUP] Fix compilation with system ICU
+
+As of chromium 92.0.4480.0 after a set of fixes ending with a
+https://chromium-review.googlesource.com/c/chromium/src/+/2830820
+the need to override UCHAR_TYPE was dropped with the result that
+codebase is ready for default 'char16_t'. Override was already dropped
+for 98-based, which already builds fine for system ICU 70.1
+
+Task-number: QTBUG-100495
+Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/third_party/icu/BUILD.gn | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
+index d5b136168ef..269de02eaaa 100644
+--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -410,12 +410,6 @@ config("system_icu_config") {
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
+-
+- if (is_win) {
+- defines += [ "UCHAR_TYPE=wchar_t" ]
+- } else {
+- defines += [ "UCHAR_TYPE=uint16_t" ]
+- }
+ }
+
+ if (use_system_icu) {
+--
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
index 3642199e..23eed817 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
media-libs/libglvnd
"
+PATCHES=( "${FILESDIR}/${PN}-6.3.0-system-icu.patch" ) # https://bugs.gentoo.org/838742
+
python_check_deps() {
has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
}
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-04-26 15:03 99% [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ Jimi Huotari
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox