commit: 2cc6a49343586a8f067e0c62819ad1155a229368 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jun 14 22:17:53 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 16 18:00:39 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2cc6a493
dev-qt/qtwebengine: Drop upstreamed icu patch from 5.9 branch Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ---------------- dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 - 2 files changed, 17 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 deleted file mode 100644 index 9866ab92..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild index 97480393..1cfd7f69 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild @@ -78,7 +78,6 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" "${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch" "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
