commit: 9fc33af6d26ab78fa51e4570e972502cad3bb9ee Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sat Dec 9 16:16:15 2017 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Sat Dec 9 16:18:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9fc33af6
dev-qt/qtwebengine: remove unneeded patch The ICU 60.1 patch is not needed, nor does it apply on 5.9999/5.10. Package-Manager: Portage-2.3.17, 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.9999.ebuild | 2 -- 3 files changed, 20 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.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild index 2b51fbf7..2c0bd638 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild @@ -73,8 +73,6 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES=( "${FILESDIR}/${PN}-5.9.3-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 2b51fbf7..2c0bd638 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -73,8 +73,6 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" ) - src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
