Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
Date: Wed, 29 Apr 2020 18:09:14
Message-Id: 1588183705.e89598d59927472104961d95b69d9be13f97e236.asturm@gentoo
1 commit: e89598d59927472104961d95b69d9be13f97e236
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: Wed Apr 29 18:08:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89598d5
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.14.2.ebuild | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
18 index 029e99a265a..a834319edbc 100644
19 --- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
20 +++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
21 @@ -91,7 +91,8 @@ src_prepare() {
22 -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
23
24 # bug 620444 - ensure local headers are used
25 - find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
26 + find "${S}" -type f -name "*.pr[fio]" | \
27 + xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
28
29 if use system-icu; then
30 # Sanity check to ensure that bundled copy of ICU is not used.