[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/

[Michael Palimaka]

commit:     0d0d887849cecce39c488f5e055d8b3f56cf4e5c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 14:02:48 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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