aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-12-02 01:02:48 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-12-02 01:02:51 +1100
commit0d0d887849cecce39c488f5e055d8b3f56cf4e5c (patch)
tree1ef46a975c0cd159074329fce39633fc4fb8f65e
parentdev-qt/qtgui: fix automagic dependency (diff)
downloadqt-0d0d8878.tar.gz
qt-0d0d8878.tar.bz2
qt-0d0d8878.zip
dev-qt/qtwebengine: ensure build against system icu headers
Gentoo-bug: 601264 Package-Manager: portage-2.3.2
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild5
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild5
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild5
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.9999.ebuild5
4 files changed, 20 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 4d718add..38e85258 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 4d718add..38e85258 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 4d718add..38e85258 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 4d718add..38e85258 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