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

[Michael Palimaka]

commit:     95b94093e5a8aef05a777bbec859af86d91cd194
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 12:18:27 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 15:51:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=95b94093

dev-qt/qtwebengine: avoid build failure by ensuring system headers are used

Gentoo-bug: 620444
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild    | 3 +++
 dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 3 +++
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild   | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
 
+       # bug 620444 - ensure local headers are used
+       find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH 
+= |&$$QTWEBENGINE_ROOT/include |' || die
+
        qt_use_disable_config alsa alsa src/core/config/linux.pri
        qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
 
+       # bug 620444 - ensure local headers are used
+       find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH 
+= |&$$QTWEBENGINE_ROOT/include |' || die
+
        qt_use_disable_config alsa alsa src/core/config/linux.pri
        qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
 
+       # bug 620444 - ensure local headers are used
+       find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH 
+= |&$$QTWEBENGINE_ROOT/include |' || die
+
        qt_use_disable_config alsa alsa src/core/config/linux.pri
        qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri