commit: 8e488dabaa7ea2058ed9fefc1986b2ddedaebe5c Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Fri Dec 15 21:57:25 2017 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Fri Dec 15 22:01:24 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8e488dab
dev-qt/qtwebengine: bring back the ICU patch for 5.9.9999 While 9fc33af6d26ab78fa51e4570e972502cad3bb9ee is correct in that this patch does not apply on 5.9999 and 5.10.*, it's still required for 5.9.9999 (and the others do have the same issue still, but require a different patch). Package-Manager: Portage-2.3.18, Repoman-2.3.6 .../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++++++++++++++++ 1 file changed, 16 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
