dev-qt/qtwebengine: Fix build with >=ICU-60

Closes: https://bugs.gentoo.org/639220
Package-Manager: Portage-2.3.16, Repoman-2.3.6
This commit is contained in:
Andreas Sturmlechner
2017-12-05 01:52:02 +01:00
committed by Michael Palimaka
parent ddd4d52973
commit 38591f8810
2 changed files with 18 additions and 0 deletions

View File

@@ -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

View File

@@ -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" )