commit: b15d1aecf2a9022c2b4716fc70152db3e3e6596e Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Wed May 1 09:25:31 2019 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed May 1 09:26:09 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b15d1aec
dev-qt/qtwebengine: remove patch landed upstream Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> .../files/qtwebengine-5.13.0-fixup-system-icu.patch | 17 ----------------- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ---- 2 files changed, 21 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch deleted file mode 100644 index e7fb9f81..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch +++ /dev/null @@ -1,17 +0,0 @@ -From https://codereview.qt-project.org/#/c/251995/ - ---- a/src/3rdparty/chromium/url/url_idna_icu.cc -+++ b/src/3rdparty/chromium/url/url_idna_icu.cc -@@ -86,8 +86,10 @@ bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) { - while (true) { - UErrorCode err = U_ZERO_ERROR; - UIDNAInfo info = UIDNA_INFO_INITIALIZER; -- int output_length = uidna_nameToASCII(uidna, src, src_len, output->data(), -- output->capacity(), &info, &err); -+ int output_length = uidna_nameToASCII(uidna, -+ reinterpret_cast<const UChar*>(src), src_len, -+ reinterpret_cast<UChar*>(output->data()), output->capacity(), -+ &info, &err); - if (U_SUCCESS(err) && info.errors == 0) { - output->set_length(output_length); - return true; diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index f880cc18..92ce913b 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -78,10 +78,6 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES=( - "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" -) - src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
