1 |
commit: 71e50ca9750a01ae4342693b495eaa18f4723d0f |
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:28:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e50ca9 |
7 |
|
8 |
dev-qt/qtwebengine: Fix .qmake.conf |
9 |
|
10 |
Bug: https://bugs.gentoo.org/811441 |
11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
...5.2_p20210824.ebuild => qtwebengine-5.15.2_p20210824-r1.ebuild} | 7 +++---- |
15 |
1 file changed, 3 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild |
18 |
similarity index 96% |
19 |
rename from dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild |
20 |
rename to dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild |
21 |
index 303ae1fe054..b1b5dd8a07c 100644 |
22 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild |
23 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild |
24 |
@@ -141,11 +141,10 @@ src_prepare() { |
25 |
if [[ ${PV} == ${QT5_PV}_p* ]]; then |
26 |
# This is made from git, and for some reason will fail w/o .git directories. |
27 |
mkdir -p .git src/3rdparty/chromium/.git || die |
28 |
- |
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.*/${QT5_PV}*/" -i .qmake.conf || die |
32 |
fi |
33 |
+ # We need to make sure this integrates well into Qt 5.15.2 installation. |
34 |
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. |
35 |
+ sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die |
36 |
|
37 |
# QTBUG-88657 - jumbo-build could still make trouble |
38 |
if ! use jumbo-build; then |