From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 77E8859CA3 for ; Wed, 9 Mar 2016 11:58:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28F7221C001; Wed, 9 Mar 2016 11:58:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEC1B21C001 for ; Wed, 9 Mar 2016 11:58:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F75D340C35 for ; Wed, 9 Mar 2016 11:58:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68F7B1BA0 for ; Wed, 9 Mar 2016 11:58:06 +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: <1457524649.05eeed53556569fe2eb880bfab0884f5c5dfc03a.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 05eeed53556569fe2eb880bfab0884f5c5dfc03a X-VCS-Branch: master Date: Wed, 9 Mar 2016 11:58:06 +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-Archives-Salt: b4a5b7b0-741d-4ad3-8fe4-87914213aa38 X-Archives-Hash: 0332090ba7f3d316385fbbbbf05f1944 commit: 05eeed53556569fe2eb880bfab0884f5c5dfc03a Author: Jan Kundrát kde org> AuthorDate: Wed Mar 9 11:34:25 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Mar 9 11:57:29 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=05eeed53 dev-qt/qtwebengine: Do not apply a patch which is already in the 5.6 branch This got merged on March 1st, see [1]. As far as I can see, it hasn't been merged into 5.7 yet. [1] https://codereview.qt-project.org/149873/ dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild index 34ca7d3..5293465 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild @@ -68,8 +68,6 @@ DEPEND="${RDEPEND} sys-devel/bison " -PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" ) - src_prepare() { qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \