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 09EA11395E2 for ; Thu, 1 Dec 2016 14:03:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F495E0BC1; Thu, 1 Dec 2016 14:03:04 +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 0C138E0BC1 for ; Thu, 1 Dec 2016 14:03:04 +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 B9B27340F53 for ; Thu, 1 Dec 2016 14:03:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F4C4498 for ; Thu, 1 Dec 2016 14:03:01 +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: <1480600971.0d0d887849cecce39c488f5e055d8b3f56cf4e5c.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 dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0d0d887849cecce39c488f5e055d8b3f56cf4e5c X-VCS-Branch: master Date: Thu, 1 Dec 2016 14:03:01 +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: ea7d5959-9f25-403b-910c-a450c0c87b89 X-Archives-Hash: fdc6a631a147efaa7d0b8cc33e0b1fbb commit: 0d0d887849cecce39c488f5e055d8b3f56cf4e5c Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 1 14:02:48 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 1 14:02:51 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d0d8878 dev-qt/qtwebengine: ensure build against system icu headers Gentoo-bug: 601264 Package-Manager: portage-2.3.2 dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 5 +++++ dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 5 +++++ dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 5 +++++ dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild index 4d718ad..38e8525 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild @@ -71,6 +71,11 @@ DEPEND="${RDEPEND} " src_prepare() { + if use system-icu; then + # ensuire build against system headers - bug #601264 + rm -r src/3rdparty/chromium/third_party/icu/source || die + fi + qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild index 4d718ad..38e8525 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild @@ -71,6 +71,11 @@ DEPEND="${RDEPEND} " src_prepare() { + if use system-icu; then + # ensuire build against system headers - bug #601264 + rm -r src/3rdparty/chromium/third_party/icu/source || die + fi + qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild index 4d718ad..38e8525 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild @@ -71,6 +71,11 @@ DEPEND="${RDEPEND} " src_prepare() { + if use system-icu; then + # ensuire build against system headers - bug #601264 + rm -r src/3rdparty/chromium/third_party/icu/source || die + fi + qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 4d718ad..38e8525 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -71,6 +71,11 @@ DEPEND="${RDEPEND} " src_prepare() { + if use system-icu; then + # ensuire build against system headers - bug #601264 + rm -r src/3rdparty/chromium/third_party/icu/source || die + fi + qt_use_disable_mod geolocation positioning \ src/core/core_common.pri \ src/core/core_gyp_generator.pro