| 1 |
commit: 0d0d887849cecce39c488f5e055d8b3f56cf4e5c |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 14:02:48 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 14:02:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d0d8878 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: ensure build against system icu headers |
| 9 |
|
| 10 |
Gentoo-bug: 601264 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2 |
| 13 |
|
| 14 |
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 5 +++++ |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 5 +++++ |
| 16 |
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 5 +++++ |
| 17 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +++++ |
| 18 |
4 files changed, 20 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild |
| 21 |
index 4d718ad..38e8525 100644 |
| 22 |
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild |
| 23 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild |
| 24 |
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND} |
| 25 |
" |
| 26 |
|
| 27 |
src_prepare() { |
| 28 |
+ if use system-icu; then |
| 29 |
+ # ensuire build against system headers - bug #601264 |
| 30 |
+ rm -r src/3rdparty/chromium/third_party/icu/source || die |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
qt_use_disable_mod geolocation positioning \ |
| 34 |
src/core/core_common.pri \ |
| 35 |
src/core/core_gyp_generator.pro |
| 36 |
|
| 37 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild |
| 38 |
index 4d718ad..38e8525 100644 |
| 39 |
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild |
| 40 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild |
| 41 |
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND} |
| 42 |
" |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
+ if use system-icu; then |
| 46 |
+ # ensuire build against system headers - bug #601264 |
| 47 |
+ rm -r src/3rdparty/chromium/third_party/icu/source || die |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
qt_use_disable_mod geolocation positioning \ |
| 51 |
src/core/core_common.pri \ |
| 52 |
src/core/core_gyp_generator.pro |
| 53 |
|
| 54 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild |
| 55 |
index 4d718ad..38e8525 100644 |
| 56 |
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild |
| 57 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild |
| 58 |
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND} |
| 59 |
" |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
+ if use system-icu; then |
| 63 |
+ # ensuire build against system headers - bug #601264 |
| 64 |
+ rm -r src/3rdparty/chromium/third_party/icu/source || die |
| 65 |
+ fi |
| 66 |
+ |
| 67 |
qt_use_disable_mod geolocation positioning \ |
| 68 |
src/core/core_common.pri \ |
| 69 |
src/core/core_gyp_generator.pro |
| 70 |
|
| 71 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 72 |
index 4d718ad..38e8525 100644 |
| 73 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 74 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 75 |
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND} |
| 76 |
" |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
+ if use system-icu; then |
| 80 |
+ # ensuire build against system headers - bug #601264 |
| 81 |
+ rm -r src/3rdparty/chromium/third_party/icu/source || die |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
qt_use_disable_mod geolocation positioning \ |
| 85 |
src/core/core_common.pri \ |
| 86 |
src/core/core_gyp_generator.pro |
Archives