commit: 0f96244f88e39a6132b484dde151de55ebad29a3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 5 11:25:20 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Dec 5 11:25:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f96244f
dev-qt/qtwebengine: Fix build with >=ICU-60 Bug: https://bugs.gentoo.org/639220 Package-Manager: Portage-2.3.14, Repoman-2.3.6 .../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 ++ dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 ++ dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++ 4 files changed, 22 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 00000000..9866ab92 --- /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.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild index 2c0bd638..afb0d89d 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.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" ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild index 2c0bd638..afb0d89d 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.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" ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 2c0bd638..afb0d89d 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.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" )
