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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CAE9139083 for ; Tue, 5 Dec 2017 11:21:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D17F1E0FF5; Tue, 5 Dec 2017 11:21:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ABDA8E0FF5 for ; Tue, 5 Dec 2017 11:21:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5226333BF0B for ; Tue, 5 Dec 2017 11:21:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE907AE65 for ; Tue, 5 Dec 2017 11:21:47 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1512472886.38591f8810ec877e3be5965f0ed753c5fcbf9f2b.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 38591f8810ec877e3be5965f0ed753c5fcbf9f2b X-VCS-Branch: master Date: Tue, 5 Dec 2017 11:21:47 +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-Archives-Salt: 2ab3b7fd-04de-4862-9ff8-7564167837a5 X-Archives-Hash: 913070e89aa17501376245f4763f8871 commit: 38591f8810ec877e3be5965f0ed753c5fcbf9f2b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 5 00:52:02 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Dec 5 11:21:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38591f88 dev-qt/qtwebengine: Fix build with >=ICU-60 Closes: https://bugs.gentoo.org/639220 Package-Manager: Portage-2.3.16, Repoman-2.3.6 .../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 2 ++ 2 files changed, 18 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch new file mode 100644 index 00000000000..9866ab92919 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch @@ -0,0 +1,16 @@ +Fix build with >=ICU-60 + +Bug: https://bugs.gentoo.org/639220 +Bug: https://bugreports.qt.io/browse/QTBUG-64925 + +--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc ++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc +@@ -488,7 +488,7 @@ + // are added to the allowed set. The list has to be updated when a new + // version of Unicode is released. The current version is 9.0.0 and ICU 60 + // will have Unicode 10.0 data. +-#if U_ICU_VERSION_MAJOR_NUM < 60 ++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT) + const icu::UnicodeSet aspirational_scripts( + icu::UnicodeString( + // Unified Canadian Syllabics diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild index 2c0bd6388d5..afb0d89df44 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild @@ -73,6 +73,8 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " +PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) + src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )