From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9C4C138350 for ; Wed, 29 Apr 2020 16:02:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 123CFE086A; Wed, 29 Apr 2020 16:02:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDCD0E086A for ; Wed, 29 Apr 2020 16:02:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8319634EE1B for ; Wed, 29 Apr 2020 16:02:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7F741F9 for ; Wed, 29 Apr 2020 16:02:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1588110404.32db3f7c38a616153d53a1bee35e08af295aa84e.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 32db3f7c38a616153d53a1bee35e08af295aa84e X-VCS-Branch: master Date: Wed, 29 Apr 2020 16:02:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bfaeec91-01fc-42db-8356-d85c81ec6b87 X-Archives-Hash: 08eaae2a5393e5beeaf4633d6856e60c commit: 32db3f7c38a616153d53a1bee35e08af295aa84e Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sun Apr 26 12:57:02 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 28 21:46:44 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=32db3f7c dev-qt/qtwebengine: Fix using generated headers Closes: https://bugs.gentoo.org/717122 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild | 3 ++- dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 3 ++- 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.