mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-qt/qtwebengine: Detect >=dev-util/ninja-1.10
Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
From 8c1a4841174a90299ba2e2851b4d9e79da3b9b25 Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Burtsev <kirill.burtsev@qt.io>
|
||||
Date: Fri, 6 Mar 2020 17:38:45 +0100
|
||||
Subject: [PATCH] Support build with system ninja >= 1.10.0
|
||||
|
||||
Fixes: QTBUG-82715
|
||||
Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9
|
||||
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
||||
---
|
||||
configure.pri | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.pri b/configure.pri
|
||||
index 3a144e3f8e..3cfce71e03 100644
|
||||
--- a/configure.pri
|
||||
+++ b/configure.pri
|
||||
@@ -163,7 +163,7 @@ defineTest(qtConfTest_detectNinja) {
|
||||
!isEmpty(ninja) {
|
||||
qtLog("Found ninja from path: $$ninja")
|
||||
qtRunLoggedCommand("$$ninja --version", version)|return(false)
|
||||
- contains(version, "1.[7-9].*"): return(true)
|
||||
+ contains(version, "1\.([7-9]|1[0-9])\..*"): return(true)
|
||||
qtLog("Ninja version too old")
|
||||
}
|
||||
qtLog("Building own ninja")
|
||||
--
|
||||
2.16.3
|
||||
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
|
||||
"${FILESDIR}/${P}-detect-ninja-1.10.patch" # QTBUG-82715, fixed in Qt 5.14.2
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user