diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2017-05-14 04:13:12 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2017-05-14 04:13:12 +0200 |
| commit | 1c3f35a6f3ca265058cc703ca4f43d79894e3ac3 (patch) | |
| tree | 2d659ad9e71ddaf92cf5cc515e984087a193529e | |
| parent | dev-python/pyside: really make MultimediaWidgets and QuickWidgets optional (diff) | |
| parent | dev-qt/qtwebengine: Fix the location of 'configure.prf'. (diff) | |
| download | qt-1c3f35a6f3ca265058cc703ca4f43d79894e3ac3.tar.gz qt-1c3f35a6f3ca265058cc703ca4f43d79894e3ac3.tar.bz2 qt-1c3f35a6f3ca265058cc703ca4f43d79894e3ac3.zip | |
Merge pull request #152 from Chiitoo/qtwebengine
Closes: https://github.com/gentoo/qt/pull/152
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild | 5 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 9 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 9 |
3 files changed, 4 insertions, 19 deletions
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild index 38c2fcf0..72750bde 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild @@ -74,11 +74,6 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) - if use system-icu; then - # ensure 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_chromium.pri \ diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild index 38c2fcf0..bebfc788 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild @@ -74,15 +74,10 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) - if use system-icu; then - # ensure 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 \ + mkspecs/features/configure.prf \ src/core/core_chromium.pri \ - tools/qmake/mkspecs/features/configure.prf + src/core/core_common.pri qt_use_disable_mod widgets widgets src/src.pro diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 38c2fcf0..bebfc788 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -74,15 +74,10 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) - if use system-icu; then - # ensure 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 \ + mkspecs/features/configure.prf \ src/core/core_chromium.pri \ - tools/qmake/mkspecs/features/configure.prf + src/core/core_common.pri qt_use_disable_mod widgets widgets src/src.pro |