From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2A81138334 for ; Wed, 1 May 2019 09:26:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3F09E08A5; Wed, 1 May 2019 09:26:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8A6AE08A5 for ; Wed, 1 May 2019 09:26:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4EFEC3431C5 for ; Wed, 1 May 2019 09:26:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA077567 for ; Wed, 1 May 2019 09:26:17 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1556702769.b15d1aecf2a9022c2b4716fc70152db3e3e6596e.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b15d1aecf2a9022c2b4716fc70152db3e3e6596e X-VCS-Branch: master Date: Wed, 1 May 2019 09:26:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 173f2faf-03bc-4e7a-9e8e-69325237999d X-Archives-Hash: 7dd336ff3bec5dcb8cfd3c1b0fcc0a01 commit: b15d1aecf2a9022c2b4716fc70152db3e3e6596e Author: Michael Palimaka gentoo org> AuthorDate: Wed May 1 09:25:31 2019 +0000 Commit: Michael Palimaka gentoo 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 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(src), src_len, -+ reinterpret_cast(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" )