From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
Date: Sun, 22 Mar 2020 14:40:59 +0000 (UTC) [thread overview]
Message-ID: <1584888047.f2b3edf188a8d02dff24998b5e73e7e17a951f1c.asturm@gentoo> (raw)
commit: f2b3edf188a8d02dff24998b5e73e7e17a951f1c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 14:01:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 14:40:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b3edf1
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 <AT> gentoo.org>
.../qtwebengine-5.14.1-detect-ninja-1.10.patch | 27 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 1 +
2 files changed, 28 insertions(+)
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 00000000000..8200fb9f906
--- /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 4579f329664..601e198c642 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() {
next reply other threads:[~2020-03-22 14:41 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 14:40 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-09 5:35 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ Ionen Wolkens
2025-09-28 6:53 Ionen Wolkens
2025-09-09 10:30 Ionen Wolkens
2025-07-10 14:33 Ionen Wolkens
2025-06-05 8:46 Ionen Wolkens
2025-04-06 14:48 Ionen Wolkens
2025-04-02 5:09 Ionen Wolkens
2025-03-30 15:04 Ionen Wolkens
2025-02-26 8:47 Ionen Wolkens
2025-02-13 19:49 Ionen Wolkens
2025-01-06 22:51 Ionen Wolkens
2025-01-04 4:05 Ionen Wolkens
2024-12-28 16:58 Andreas Sturmlechner
2024-12-03 17:15 Ionen Wolkens
2024-11-23 8:44 Andreas Sturmlechner
2024-10-21 12:31 Sam James
2024-08-14 15:37 Ionen Wolkens
2024-07-28 4:30 Sam James
2024-07-03 0:39 Ionen Wolkens
2024-06-08 13:41 Ionen Wolkens
2024-05-30 12:52 Andreas Sturmlechner
2024-04-19 7:55 Ionen Wolkens
2024-04-17 0:15 Ionen Wolkens
2024-04-03 3:57 Ionen Wolkens
2024-03-22 10:29 Ionen Wolkens
2024-02-25 18:46 Ionen Wolkens
2024-02-01 23:06 Andreas Sturmlechner
2024-01-16 11:53 Andreas Sturmlechner
2024-01-03 19:10 Ionen Wolkens
2023-12-18 18:43 Ionen Wolkens
2023-11-20 13:44 Ionen Wolkens
2023-10-05 19:39 Ionen Wolkens
2023-09-07 10:03 Ionen Wolkens
2023-05-24 11:15 Andreas Sturmlechner
2023-04-25 15:38 Andreas Sturmlechner
2023-04-17 19:39 Jimi Huotari
2023-04-15 2:10 Sam James
2023-04-09 20:17 Andreas Sturmlechner
2022-09-24 14:32 Andreas Sturmlechner
2022-08-17 21:20 Ionen Wolkens
2022-06-20 18:54 Andreas Sturmlechner
2022-05-20 19:43 Andreas Sturmlechner
2022-05-14 21:24 Sam James
2022-04-17 19:29 Sam James
2022-04-09 16:07 Andreas Sturmlechner
2021-10-17 6:54 Andreas Sturmlechner
2021-09-02 18:38 Andreas Sturmlechner
2021-09-02 18:38 Andreas Sturmlechner
2021-06-14 9:25 Andreas Sturmlechner
2021-05-23 19:19 Andreas Sturmlechner
2021-03-24 12:15 Andreas Sturmlechner
2020-04-26 18:12 Andreas Sturmlechner
2020-02-10 6:42 Andreas Sturmlechner
2020-02-08 21:34 Andreas Sturmlechner
2019-10-20 14:21 Andreas Sturmlechner
2019-09-25 21:34 Andreas Sturmlechner
2019-09-01 23:07 Andreas Sturmlechner
2018-11-10 20:27 Andreas Sturmlechner
2018-05-09 20:17 Andreas Sturmlechner
2017-12-05 11:21 Michael Palimaka
2017-06-04 13:19 Michael Palimaka
2016-12-06 6:54 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1584888047.f2b3edf188a8d02dff24998b5e73e7e17a951f1c.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox