summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-03-22 15:01:16 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-03-22 15:40:47 +0100
commitf2b3edf188a8d02dff24998b5e73e7e17a951f1c (patch)
tree2bc1a666425509df4650222440b1b1ef4d181f51 /dev-qt
parentdev-util/ccache: sparc stable wrt bug #713916 (diff)
downloadgentoo-f2b3edf188a8d02dff24998b5e73e7e17a951f1c.tar.gz
gentoo-f2b3edf188a8d02dff24998b5e73e7e17a951f1c.tar.bz2
gentoo-f2b3edf188a8d02dff24998b5e73e7e17a951f1c.zip
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>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch27
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild1
2 files changed, 28 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
new file mode 100644
index 000000000000..8200fb9f9060
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
@@ -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
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 4579f3296645..601e198c642c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -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() {