aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2020-04-26 12:57:02 +0000
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-28 23:46:44 +0200
commit32db3f7c38a616153d53a1bee35e08af295aa84e (patch)
treef79b240ff88fc32c6ac7ac00b2768962b0f3888e
parentdev-qt: Use qt5_tools_configure where possible (diff)
downloadqt-32db3f7c.tar.gz
qt-32db3f7c.tar.bz2
qt-32db3f7c.zip
dev-qt/qtwebengine: Fix using generated headers
Closes: https://bugs.gentoo.org/717122 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild3
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild3
2 files changed, 4 insertions, 2 deletions
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
index 989a394f..84a5805b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
@@ -91,7 +91,8 @@ src_prepare() {
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ find "${S}" -type f -name "*.pr[fio]" | \
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 989a394f..84a5805b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -91,7 +91,8 @@ src_prepare() {
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ find "${S}" -type f -name "*.pr[fio]" | \
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.