| 1 |
commit: 32db3f7c38a616153d53a1bee35e08af295aa84e |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sun Apr 26 12:57:02 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 28 21:46:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=32db3f7c |
| 7 |
|
| 8 |
dev-qt/qtwebengine: Fix using generated headers |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/717122 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild | 3 ++- |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 3 ++- |
| 16 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild |
| 19 |
index 989a394f..84a5805b 100644 |
| 20 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild |
| 21 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild |
| 22 |
@@ -91,7 +91,8 @@ src_prepare() { |
| 23 |
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die |
| 24 |
|
| 25 |
# bug 620444 - ensure local headers are used |
| 26 |
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 27 |
+ find "${S}" -type f -name "*.pr[fio]" | \ |
| 28 |
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die |
| 29 |
|
| 30 |
if use system-icu; then |
| 31 |
# Sanity check to ensure that bundled copy of ICU is not used. |
| 32 |
|
| 33 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 34 |
index 989a394f..84a5805b 100644 |
| 35 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 36 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 37 |
@@ -91,7 +91,8 @@ src_prepare() { |
| 38 |
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die |
| 39 |
|
| 40 |
# bug 620444 - ensure local headers are used |
| 41 |
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 42 |
+ find "${S}" -type f -name "*.pr[fio]" | \ |
| 43 |
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die |
| 44 |
|
| 45 |
if use system-icu; then |
| 46 |
# Sanity check to ensure that bundled copy of ICU is not used. |
Archives