Skip to content

Commit fcd1625

Browse files
committed
qt: add version 6.9.0
1 parent 41e606f commit fcd1625

File tree

4 files changed

+411
-0
lines changed

4 files changed

+411
-0
lines changed

recipes/qt/6.x.x/conandata.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
sources:
2+
"6.9.0":
3+
url:
4+
- "https://download.qt.io/official_releases/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
5+
- "https://download.qt.io/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
6+
- "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
7+
- "https://mirrors.20i.com/pub/qt.io/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
8+
- "https://ftp.nluug.nl/languages/qt/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
9+
- "https://mirror.netcologne.de/qtproject/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
10+
- "https://qt-mirror.dannhauer.de/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
11+
- "https://ftp.fau.de/qtproject/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
12+
- "https://mirrors.dotsrc.org/qtproject/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
13+
- "https://ftp.icm.edu.pl/packages/qt/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
14+
- "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
15+
- "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
16+
- "https://qt.mirror.constant.com/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
17+
- "https://mirrors.sau.edu.cn/qt/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
18+
- "https://mirrors.cloud.tencent.com/qt/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
19+
- "https://mirror.bjtu.edu.cn/qt/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
20+
- "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
21+
- "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
22+
- "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.9/6.9.0/single/qt-everywhere-src-6.9.0.tar.xz"
23+
sha256: "4f61e50551d0004a513fefbdb0a410595d94812a48600646fb7341ea0d17e1cb"
224
"6.7.3":
325
url:
426
- "https://download.qt.io/official_releases/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
@@ -65,6 +87,12 @@ sources:
6587
- "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
6688
sha256: "7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb"
6789
patches:
90+
"6.9.0":
91+
- "base_path": "qtwebengine"
92+
"patch_description": "Workaround for too long .rps file name"
93+
"patch_file": "patches/c72097e_6.9.0.diff"
94+
"patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
95+
"patch_type": "bugfix"
6896
"6.7.3":
6997
- "base_path": "qtwebengine"
7098
"patch_description": "Workaround for too long .rps file name"
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
From c72097e8790553771daf3231124c3fbe1a438379 Mon Sep 17 00:00:00 2001
2+
From: Samuli Piippo <[email protected]>
3+
Date: Thu, 30 Mar 2017 11:37:24 +0300
4+
Subject: [PATCH] chromium: workaround for too long .rps file name
5+
6+
Ninja may fail when the build directory is too long:
7+
8+
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
9+
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
10+
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
11+
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
12+
le.rsp): Unable to create file. File name too long
13+
14+
Task-number: QTBUG-59769
15+
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
16+
---
17+
src/3rdparty/gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
18+
1 file changed, 9 insertions(+)
19+
20+
diff --git a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc b/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
21+
index a5bc6cd..5cefbfe 100644
22+
--- a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
23+
+++ b/src/3rdparty/gn/tosrcols/gn/ninja_action_target_writer.cc
24+
@@ -155,6 +155,14 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
25+
// strictly necessary for regular one-shot actions, but it's easier to
26+
// just always define unique_name.
27+
std::string rspfile = custom_rule_name;
28+
+
29+
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
30+
+ //please note ".$unique_name" is not used at the moment
31+
+ std::size_t pos = 0;
32+
+ std::string delimiter("_");
33+
+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
34+
+ rspfile = rspfile.substr(0,pos);
35+
+
36+
if (!target_->sources().empty())
37+
rspfile += ".$unique_name";
38+
rspfile += ".rsp";
39+
+
40+
out_ << " rspfile = " << rspfile << std::endl;
41+
42+
// Response file contents.

0 commit comments

Comments
 (0)