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 DA7381382C5 for ; Tue, 17 Apr 2018 10:23:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08D09E085A; Tue, 17 Apr 2018 10:23:39 +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 D5B49E085A for ; Tue, 17 Apr 2018 10:23:38 +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 5AABA335C36 for ; Tue, 17 Apr 2018 10:23:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 562A0285 for ; Tue, 17 Apr 2018 10:23:35 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1523960143.f45f261f4b594a94aa6f1307e13be8eb378bff08.chiitoo@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.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: f45f261f4b594a94aa6f1307e13be8eb378bff08 X-VCS-Branch: master Date: Tue, 17 Apr 2018 10:23:35 +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: fc69cdcc-8263-4040-a8eb-c97fec756382 X-Archives-Hash: 29d56dc58fbac72476f7673a2a101b37 commit: f45f261f4b594a94aa6f1307e13be8eb378bff08 Author: Jimi Huotari gentoo org> AuthorDate: Tue Apr 17 10:15:43 2018 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Tue Apr 17 10:15:43 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f45f261f dev-qt/qtwebengine: remove upstreamed ICU patches from 5.9999 Package-Manager: Portage-2.3.28, Repoman-2.3.9 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 0fc2f021..32064b19 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -11,10 +11,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -SRC_URI+=" system-icu? ( - https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2 -)" - IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" RDEPEND=" @@ -84,10 +80,7 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) use system-icu && has_version ">=dev-libs/icu-59" && \ - PATCHES+=( - "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" - "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" - ) + PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" ) # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die