From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED07515808E for ; Tue, 26 Apr 2022 15:03:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F1E7E07EE; Tue, 26 Apr 2022 15:03:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D53B9E07EE for ; Tue, 26 Apr 2022 15:03:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BDE1F3415B1 for ; Tue, 26 Apr 2022 15:03:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9DEA3BE for ; Tue, 26 Apr 2022 15:03:41 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1650985172.ce687067d9fd189ca0faab3c31dc5b8f4db0d00f.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: ce687067d9fd189ca0faab3c31dc5b8f4db0d00f X-VCS-Branch: master Date: Tue, 26 Apr 2022 15:03:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 13ef1254-91a1-4c37-b9b2-190f4b6ab010 X-Archives-Hash: b11cfbcc4352f3cde00826e3961813e1 commit: ce687067d9fd189ca0faab3c31dc5b8f4db0d00f Author: Jimi Huotari gentoo org> AuthorDate: Tue Apr 26 14:59:32 2022 +0000 Commit: Jimi Huotari gentoo 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 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 +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 +--- + 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}]" }