diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-05 22:25:20 +1100 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2017-12-05 22:25:45 +1100 |
| commit | 0f96244f88e39a6132b484dde151de55ebad29a3 (patch) | |
| tree | 24775e117724d6453c1554749d055fbef45aabc9 | |
| parent | lxqt-base/lxqt-runner: update the 'lxde-base/menu-cache' dependency (diff) | |
| download | qt-0f96244f88e39a6132b484dde151de55ebad29a3.tar.gz qt-0f96244f88e39a6132b484dde151de55ebad29a3.tar.bz2 qt-0f96244f88e39a6132b484dde151de55ebad29a3.zip | |
dev-qt/qtwebengine: Fix build with >=ICU-60
Bug: https://bugs.gentoo.org/639220
Package-Manager: Portage-2.3.14, Repoman-2.3.6
4 files changed, 22 insertions, 0 deletions
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" ) |