qt/5.15.2

recipes/qt/all/conandata.yml

@@ -0,0 +1,14 @@
+sources:
+  "5.15.0":
+    url: "https://download.qt.io/archive/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz"
+    sha256: "22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3"
+patches:
+  "5.15.0":
+    - patch_file: "patches/aa2a39dea5.diff"
+      base_path: "qt5/qtbase"
+    - patch_file: "patches/c72097e.diff"
+      base_path: "qt5/qtwebengine"
+    - patch_file: "patches/e2eb6e9.diff"
+      base_path: "qt5/qtbase"
+    - patch_file: "patches/c994a33.diff"
+      base_path: "qt5/qtbase"

recipes/qt/all/patches/aa2a39dea5.diff

@@ -0,0 +1,29 @@
+From aa2a39dea5918c63045310b0d2a7e34ce9934e0c Mon Sep 17 00:00:00 2001
+From: Eric Lemanissier <[email protected]>
+Date: Tue, 26 Nov 2019 12:47:47 +0100
+Subject: [PATCH] add inline source detection to glib
+
+this allows to use static version of glib (pkg-config only works with shared libraries)
+
+Change-Id: If9b0054985b87b8da43269425b32c2e4ffb65f5a
+---
+ src/corelib/configure.json | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/configure.json b/src/corelib/configure.json
+index ae360239c6..998687dc4e 100644
+--- a/src/corelib/configure.json
++++ b/src/corelib/configure.json
+@@ -45,7 +45,8 @@
+             },
+             "headers": "glib.h",
+             "sources": [
+-                { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" }
++                { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" },
++				"-lgthread-2.0 -lglib-2.0"
+             ]
+         },
+         "posix_iconv": {
+-- 
+2.23.0.windows.1
+

recipes/qt/all/patches/c72097e.diff

@@ -0,0 +1,42 @@
+From c72097e8790553771daf3231124c3fbe1a438379 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <[email protected]>
+Date: Thu, 30 Mar 2017 11:37:24 +0300
+Subject: [PATCH] chromium: workaround for too long .rps file name
+
+Ninja may fail when the build directory is too long:
+
+ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
+interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
+6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
+.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
+le.rsp): Unable to create file. File name too long
+
+Task-number: QTBUG-59769
+Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
+---
+ src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc b/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc
+index a5bc6cd..5cefbfe 100644
+--- a/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc
++++ b/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc
+@@ -119,9 +119,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
+     // strictly necessary for regular one-shot actions, but it's easier to
+     // just always define unique_name.
+     std::string rspfile = custom_rule_name;
++
++    //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
++    //please note ".$unique_name" is not used at the moment
++    int pos = 0;
++    std::string delimiter("_");
++    while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
++        rspfile = rspfile.substr(0,pos);
++
+     if (!target_->sources().empty())
+       rspfile += ".$unique_name";
+     rspfile += ".rsp";
++
+     out_ << "  rspfile = " << rspfile << std::endl;
+
+     // Response file contents.

recipes/qt/all/patches/c994a33.diff

@@ -0,0 +1,27 @@
+From c994a334701ab80fcc154f5330492c751d1e2490 Mon Sep 17 00:00:00 2001
+From: Eric Lemanissier <[email protected]>
+Date: Tue, 26 May 2020 16:51:08 +0000
+Subject: [PATCH] QMimeDatabase/xml: use xmlstarlet instead of xml
+
+some distributions (eg Ubuntu) don't provide xml executable, but only xmlstarlet executable
+
+Change-Id: Icc801ded8d4ec1ec4d1dab93289a2365f8cd9cbd
+Pick-to: 5.15
+---
+
+diff --git a/src/corelib/mimetypes/mime/generate.pl b/src/corelib/mimetypes/mime/generate.pl
+index 0f87d61..4c1cb5b 100644
+--- a/src/corelib/mimetypes/mime/generate.pl
++++ b/src/corelib/mimetypes/mime/generate.pl
+@@ -67,9 +67,9 @@
+
+ # Check if xml (from xmlstarlet) is in $PATH
+ my $cmd;
+-if (checkCommand("xml")) {
++if (checkCommand("xmlstarlet")) {
+     # Minify the data before compressing
+-    $cmd = "xml sel -D -B -t -c / $fname";
++    $cmd = "xmlstarlet sel -D -B -t -c / $fname";
+     $cmd .= "| $compress" if $compress;
+ } elsif ($compress) {
+     $cmd = "$compress < $fname"

recipes/qt/all/patches/e2eb6e9.diff

@@ -0,0 +1,27 @@
+From e2eb6e9bf75957b3139aefc4827d6256458d8836 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <[email protected]>
+Date: Tue, 26 May 2020 09:10:39 -0700
+Subject: [PATCH] QMimeDatabase/zstd: use -T1 instead of --single-thread
+
+Some older versions of the command-line tool don't have --single-thread
+but do have -T1. They're slightly different according to the
+documentation, but it's not important to us. What we want is to make
+sure we consume a single CPU during build.
+
+Pick-To: 5.15
+Change-Id: Ied637aece2a7427b8a2dfffd16129fe88a0466ee
+---
+
+diff --git a/src/corelib/mimetypes/mime/generate.pl b/src/corelib/mimetypes/mime/generate.pl
+index 0f87d61..8ac4b50 100644
+--- a/src/corelib/mimetypes/mime/generate.pl
++++ b/src/corelib/mimetypes/mime/generate.pl
+@@ -60,7 +60,7 @@
+ if ($fname eq "--zstd") {
+     $fname = shift @ARGV;
+     if (checkCommand("zstd")) {
+-        $compress = "zstd -cq19 --single-thread";
++        $compress = "zstd -cq19 -T1";
+         $macro = "MIME_DATABASE_IS_ZSTD";
+     }
+ }