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: Sat, 09 Apr 2022 16:01:42
Message-Id: 1649520071.d786db6868603fbc18a538012a787a5887fb0403.asturm@gentoo
1 commit: d786db6868603fbc18a538012a787a5887fb0403
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 9 16:00:05 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 9 16:01:11 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d786db68
7
8 dev-qt/qtwebengine: Fix 5.15.3 version downsedding after 5.15.10 bump
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
17 index 8d3e80b6..2cc0403e 100644
18 --- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
19 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
20 @@ -169,10 +169,10 @@ src_prepare() {
21 # This is made from git, and for some reason will fail w/o .git directories.
22 mkdir -p .git src/3rdparty/chromium/.git || die
23 fi
24 - # We need to make sure this integrates well into Qt 5.15.2 installation.
25 + # We need to make sure this integrates well into Qt 5.15.3 installation.
26 # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
27 # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
28 - sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
29 + sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
30
31 # QTBUG-88657 - jumbo-build could still make trouble
32 if ! use jumbo-build; then