Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
Date: Wed, 15 Sep 2021 07:39:51
Message-Id: 1631691555.d5a402514fa556d9f54626f375d3f44c1b4982a4.asturm@gentoo
1 commit: d5a402514fa556d9f54626f375d3f44c1b4982a4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 15 07:28:12 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 15 07:39:15 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d5a40251
7
8 dev-qt/qtwebengine: Fix .qmake.conf
9
10 Package-Manager: Portage-3.0.23, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 7 +++----
14 1 file changed, 3 insertions(+), 4 deletions(-)
15
16 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
17 index 73744694..3e77c7f4 100644
18 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
19 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
20 @@ -135,11 +135,10 @@ src_prepare() {
21 if [[ ${PV} == ${QT5_PV}_p* ]]; then
22 # This is made from git, and for some reason will fail w/o .git directories.
23 mkdir -p .git src/3rdparty/chromium/.git || die
24 -
25 - # We need to make sure this integrates well into Qt 5.15.2 installation.
26 - # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
27 - sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die
28 fi
29 + # We need to make sure this integrates well into Qt 5.15.2 installation.
30 + # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
31 + sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
32
33 # QTBUG-88657 - jumbo-build could still make trouble
34 if ! use jumbo-build; then