mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-09 07:34:45 +02:00
qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
* in preparation for rebase on 5.12 #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
|
||||
|
||||
# common for qtbase-native, qtbase-nativesdk and qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
|
||||
# 5.11.meta-qt5-shared.12
|
||||
# 5.11.meta-qt5-shared.13
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -42,16 +42,16 @@ SRC_URI += "\
|
||||
file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \
|
||||
file://0016-Disable-ltcg-for-host_build.patch \
|
||||
file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
|
||||
file://0020-corelib-Include-sys-types.h-for-uint32_t.patch \
|
||||
file://0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
|
||||
file://0022-Fix-compile-issue-with-gcc-9.patch \
|
||||
file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \
|
||||
file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
|
||||
file://0020-Fix-compile-issue-with-gcc-9.patch \
|
||||
"
|
||||
|
||||
# common for qtbase-native and nativesdk-qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
|
||||
# 5.11.meta-qt5-native.12
|
||||
# 5.11.meta-qt5-native.13
|
||||
SRC_URI += " \
|
||||
file://0018-Always-build-uic-and-qvkgen.patch \
|
||||
file://0021-Always-build-uic-and-qvkgen.patch \
|
||||
"
|
||||
|
||||
# CMake's toolchain configuration of nativesdk-qtbase
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4c68386b6c42853b6ed2903ff81f6019133e6641 Mon Sep 17 00:00:00 2001
|
||||
From 72d96957995393312ad29920d67fa758d0e53ca5 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 17 Aug 2018 13:23:58 +0300
|
||||
Subject: [PATCH] Allow a tools-only build
|
||||
|
||||
@@ -12,7 +12,7 @@ DEPENDS += "qtbase"
|
||||
DEPENDS_class-target += "qtdeclarative qt3d-native"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qt3d/commits/b5.11
|
||||
# 5.11.meta-qt5.5
|
||||
# 5.11.meta-qt5.6
|
||||
SRC_URI += " \
|
||||
file://0001-Allow-a-tools-only-build.patch \
|
||||
"
|
||||
|
||||
@@ -18,7 +18,7 @@ require qt5-git.inc
|
||||
|
||||
# common for qtbase-native, qtbase-nativesdk and qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
|
||||
# 5.11.meta-qt5-shared.12
|
||||
# 5.11.meta-qt5-shared.13
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -37,21 +37,21 @@ SRC_URI += "\
|
||||
file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \
|
||||
file://0016-Disable-ltcg-for-host_build.patch \
|
||||
file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
|
||||
file://0020-corelib-Include-sys-types.h-for-uint32_t.patch \
|
||||
file://0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
|
||||
file://0022-Fix-compile-issue-with-gcc-9.patch \
|
||||
file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \
|
||||
file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
|
||||
file://0020-Fix-compile-issue-with-gcc-9.patch \
|
||||
"
|
||||
|
||||
# common for qtbase-native and nativesdk-qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
|
||||
# 5.11.meta-qt5-native.12
|
||||
# 5.11.meta-qt5-native.13
|
||||
SRC_URI += " \
|
||||
file://0018-Always-build-uic-and-qvkgen.patch \
|
||||
file://0021-Always-build-uic-and-qvkgen.patch \
|
||||
"
|
||||
|
||||
# only for qtbase-native
|
||||
SRC_URI += " \
|
||||
file://0019-Bootstrap-without-linkat-feature.patch \
|
||||
file://0022-Bootstrap-without-linkat-feature.patch \
|
||||
"
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a6f4987a281315dacc7b8b55928b9c0793cd0813 Mon Sep 17 00:00:00 2001
|
||||
From ff46b3e91a384888b299a5444adc0e9abc110d3b Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Mon, 15 Apr 2013 04:29:32 +0200
|
||||
Subject: [PATCH] Add linux-oe-g++ platform
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2409068a4a7f51f12122629ed6ba043d872a6ff6 Mon Sep 17 00:00:00 2001
|
||||
From 2592ce6190596219428eb5e500c3a5f5a14dad01 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 6 Apr 2013 13:15:07 +0200
|
||||
Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6d828cb28acc5b3fccc8ccc45b600c0f7c20201f Mon Sep 17 00:00:00 2001
|
||||
From 0ce64385c882e1f7788620ba37781d89625437cb Mon Sep 17 00:00:00 2001
|
||||
From: Holger Freyther <zecke@selfish.org>
|
||||
Date: Wed, 26 Sep 2012 17:22:30 +0200
|
||||
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
|
||||
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||
index 422d08f32c..cb092301fa 100644
|
||||
index e727f00c8e..819dbb8aa3 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||
@@ -172,7 +172,10 @@ void QLibrarySettings::load()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d10cf6bb2b0c4637bd0df07c559fcdd461379b4d Mon Sep 17 00:00:00 2001
|
||||
From 9858c07dd25d523f8e02b348c21e57c95077e108 Mon Sep 17 00:00:00 2001
|
||||
From: Denys Dmytriyenko <denys@ti.com>
|
||||
Date: Tue, 25 Aug 2015 10:05:15 -0400
|
||||
Subject: [PATCH] configure: bump path length from 256 to 512 characters
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From fc51c10426c68137c57b5ea6c7ea2bdfe0055aaf Mon Sep 17 00:00:00 2001
|
||||
From 374bf57efe5f936ab61811f7c433c870cdae77ab Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Mon, 24 Oct 2016 09:45:18 +0300
|
||||
Subject: [PATCH] Disable all unknown features instead of erroring out
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f13bad486f825f88ec7757e1c5d2dbc849d9797a Mon Sep 17 00:00:00 2001
|
||||
From 29270c9427ad9e024ecffb94f5431c08f755925d Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@siemens.com>
|
||||
Date: Wed, 11 May 2016 15:20:41 +0200
|
||||
Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7fc8b8c15007e0a1687680c66292d8ed55000053 Mon Sep 17 00:00:00 2001
|
||||
From c374524c31fbf11f8f2cd8d1036633f5c7507619 Mon Sep 17 00:00:00 2001
|
||||
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Date: Wed, 7 Jun 2017 21:00:49 +0900
|
||||
Subject: [PATCH] Delete qlonglong and qulonglong
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 83965aee0017fb424406d895af5ec2cec696f26c Mon Sep 17 00:00:00 2001
|
||||
From 40b0cf799c4af4ae92eebab64e91015d67e428c1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 27 Jul 2017 08:02:51 -0700
|
||||
Subject: [PATCH] Replace pthread_yield with sched_yield
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
From 51bc56305205a154db22c1373eb19d835ba2c64e Mon Sep 17 00:00:00 2001
|
||||
From d8c3ea974639c70d9a158d4e01c3f782133a46f8 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 3 Sep 2017 09:11:44 -0700
|
||||
Subject: [PATCH] Add OE specific specs for clang compiler
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++
|
||||
mkspecs/linux-oe-clang/qmake.conf | 42 ++++++++++++++++++++++++++
|
||||
mkspecs/linux-oe-clang/qplatformdefs.h | 1 +
|
||||
2 files changed, 44 insertions(+)
|
||||
2 files changed, 43 insertions(+)
|
||||
create mode 100644 mkspecs/linux-oe-clang/qmake.conf
|
||||
create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h
|
||||
|
||||
Index: git/mkspecs/linux-oe-clang/qmake.conf
|
||||
===================================================================
|
||||
diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
|
||||
new file mode 100644
|
||||
index 0000000000..443d4b0dff
|
||||
--- /dev/null
|
||||
+++ git/mkspecs/linux-oe-clang/qmake.conf
|
||||
+++ b/mkspecs/linux-oe-clang/qmake.conf
|
||||
@@ -0,0 +1,42 @@
|
||||
+#
|
||||
+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
|
||||
@@ -58,9 +59,10 @@ Index: git/mkspecs/linux-oe-clang/qmake.conf
|
||||
+
|
||||
+load(device_config)
|
||||
+load(qt_config)
|
||||
Index: git/mkspecs/linux-oe-clang/qplatformdefs.h
|
||||
===================================================================
|
||||
diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
|
||||
new file mode 100644
|
||||
index 0000000000..880c927b21
|
||||
--- /dev/null
|
||||
+++ git/mkspecs/linux-oe-clang/qplatformdefs.h
|
||||
+++ b/mkspecs/linux-oe-clang/qplatformdefs.h
|
||||
@@ -0,0 +1 @@
|
||||
+#include "../linux-clang/qplatformdefs.h"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f5d4eed2a82b327130f3301ea5f8e56169df3dcf Mon Sep 17 00:00:00 2001
|
||||
From 0ada7d8bec024960b2e10c9ac36f312bb0f5338c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 3 Sep 2017 09:44:48 -0700
|
||||
Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5cbe22a0f46ab9bcdc5ff8d293ce925d94e951fd Mon Sep 17 00:00:00 2001
|
||||
From 0c80cc78c3ca53134a1c66824f749676fa966246 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 3 Sep 2017 10:11:50 -0700
|
||||
Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9048b31285d643c52b4461bca646c91f1a5729d1 Mon Sep 17 00:00:00 2001
|
||||
From 2856cb239b64b7d0330bb016e080ed294f9bad3e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 14 Feb 2018 17:08:43 -0800
|
||||
Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d701e6ba0eccfb4d0e31cc33cf420020fbc870d1 Mon Sep 17 00:00:00 2001
|
||||
From f20acf6fa22235fdaa551b0410d65627e028f4b4 Mon Sep 17 00:00:00 2001
|
||||
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||
Date: Fri, 27 Apr 2018 10:38:18 +0200
|
||||
Subject: [PATCH] Upgrade double-conversion to v3.0.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From cd9a12017597d9233b529be24434225da6db614e Mon Sep 17 00:00:00 2001
|
||||
From fb6a20e6917cfa32e69791e0adb130140f4b5688 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 21 Aug 2018 00:29:06 +0200
|
||||
Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
|
||||
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
index 964dceb..c09eb01 100644
|
||||
index 964dcebeb2..c09eb0154b 100644
|
||||
--- a/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
@@ -95,6 +95,17 @@ extern "C" NSString *NSTemporaryDirectory();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8fa67276c9cfb0002d5f4077f70ce2f477edbc4d Mon Sep 17 00:00:00 2001
|
||||
From 09b304966543753e445b90b904a9f558377a87f6 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Wed, 29 Aug 2018 18:20:14 +0900
|
||||
Subject: [PATCH] double-conversion: support AARCH64EB and arm BE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3b9861c92444d50198ca74e60bcf10738998b7e9 Mon Sep 17 00:00:00 2001
|
||||
From e9ea14a04e74be6740b82d51340bb6218f35ab1f Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 23 Oct 2018 09:54:57 +0300
|
||||
Subject: [PATCH] Disable ltcg for host_build
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a154d5f20d85108fcbf36f9f39cb853438f98127 Mon Sep 17 00:00:00 2001
|
||||
From f5b11bb3ab6299912491568f84185e0174cc6e5a Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Sat, 27 Oct 2018 12:29:31 +0000
|
||||
Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d48cd5f4c46ec4ba129ae8abdfb8707285485933 Mon Sep 17 00:00:00 2001
|
||||
From dd16d19bc6b4e8ee5d61fae94cd65b7f10d6e835 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 6 Dec 2018 11:47:52 -0800
|
||||
Subject: [PATCH] corelib: Include sys/types.h for uint32_t
|
||||
@@ -25,6 +25,3 @@ index 5f8a124bcc..fe1711cf1b 100644
|
||||
|
||||
#if defined(Q_CC_MSVC)
|
||||
# include <intrin.h>
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7248a700e9c4ed1df41dbfcfebcd32bb6951bd36 Mon Sep 17 00:00:00 2001
|
||||
From 61d8dd1cfdc6334a4d81c0f043a9515346872d0c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 6 Dec 2018 15:06:20 -0800
|
||||
Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
|
||||
@@ -9,13 +9,13 @@ mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not de
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
mkspecs/features/toolchain.prf | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
mkspecs/features/toolchain.prf | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
Index: git/mkspecs/features/toolchain.prf
|
||||
===================================================================
|
||||
--- git.orig/mkspecs/features/toolchain.prf
|
||||
+++ git/mkspecs/features/toolchain.prf
|
||||
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
|
||||
index fdf3d1cdd3..6ecfd391f6 100644
|
||||
--- a/mkspecs/features/toolchain.prf
|
||||
+++ b/mkspecs/features/toolchain.prf
|
||||
@@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) {
|
||||
return($$ret)
|
||||
}
|
||||
@@ -30,7 +30,7 @@ Index: git/mkspecs/features/toolchain.prf
|
||||
isEmpty($${target_prefix}.COMPILER_MACROS) {
|
||||
msvc {
|
||||
clang_cl {
|
||||
@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACRO
|
||||
@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
|
||||
} else {
|
||||
vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0d89dead4396126606fb7954c0bb0a2734d2347b Mon Sep 17 00:00:00 2001
|
||||
From eb68b9fa27d94bc90db5b0023b224ac0e60b8243 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Tue, 13 Nov 2018 16:00:23 +0100
|
||||
Subject: [PATCH] Fix compile issue with gcc 9
|
||||
@@ -7,13 +7,13 @@ It appears messenne_twisters in the latest libstdc++ has one more
|
||||
requirement before it is willing to construct with our
|
||||
SystemGenerator struct as an sseq provider.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Upstream-Status: Backport from 5.12
|
||||
|
||||
Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
|
||||
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
|
||||
src/corelib/global/qrandom.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
@@ -29,6 +29,3 @@ index ebf9864b15..577736a867 100644
|
||||
void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
|
||||
|
||||
// For std::mersenne_twister_engine implementations that use something
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 531068a88afa3336455134d85c16934bb4002124 Mon Sep 17 00:00:00 2001
|
||||
From 4ac36e3e40bd8a4940f211cf89155618149f1f68 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 16 Nov 2013 00:32:30 +0100
|
||||
Subject: [PATCH] Always build uic and qvkgen
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0d6a38d7bec0a3017a9e325f5e2b6e6168359b33 Mon Sep 17 00:00:00 2001
|
||||
From 03c534e00991d08897541910226256e88f0f5efc Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 24 Nov 2017 15:16:31 +0200
|
||||
Subject: [PATCH] Bootstrap without linkat feature
|
||||
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific]
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
|
||||
index c5585ea32a..de895e7bf4 100644
|
||||
index 229b4d17a1..3dbb1ea65c 100644
|
||||
--- a/src/corelib/global/qconfig-bootstrapped.h
|
||||
+++ b/src/corelib/global/qconfig-bootstrapped.h
|
||||
@@ -90,7 +90,7 @@
|
||||
@@ -91,7 +91,7 @@
|
||||
#define QT_FEATURE_itemmodel -1
|
||||
#define QT_FEATURE_library -1
|
||||
#ifdef __linux__
|
||||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
# common for qtbase-native, qtbase-nativesdk and qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
|
||||
# 5.11.meta-qt5-shared.12
|
||||
# 5.11.meta-qt5-shared.13
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -33,9 +33,9 @@ SRC_URI += "\
|
||||
file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \
|
||||
file://0016-Disable-ltcg-for-host_build.patch \
|
||||
file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
|
||||
file://0020-corelib-Include-sys-types.h-for-uint32_t.patch \
|
||||
file://0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
|
||||
file://0022-Fix-compile-issue-with-gcc-9.patch \
|
||||
file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \
|
||||
file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
|
||||
file://0020-Fix-compile-issue-with-gcc-9.patch \
|
||||
"
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a583a22e433d6f9d3c2edb4ea45195a967848b9e Mon Sep 17 00:00:00 2001
|
||||
From c5103b4f832be57759f475d05c98f946d150c39d Mon Sep 17 00:00:00 2001
|
||||
From: Wenlin Kang <wenlin.kang@windriver.com>
|
||||
Date: Thu, 8 Sep 2016 12:18:13 +0800
|
||||
Subject: [PATCH] qtmultimedia: fix a conflicting declaration
|
||||
|
||||
@@ -28,7 +28,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream
|
||||
CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11
|
||||
# 5.11.meta-qt5.5
|
||||
# 5.11.meta-qt5.6
|
||||
SRC_URI += "\
|
||||
file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
|
||||
"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 850b6998ea08110ca32dbab4d92bd7b349032d0e Mon Sep 17 00:00:00 2001
|
||||
From cac05ba982e5047c11add015f6f6125863e5226d Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Wed, 7 Jun 2017 15:17:12 +0300
|
||||
Subject: [PATCH] Allow a tools-only build
|
||||
|
||||
@@ -12,7 +12,7 @@ require qt5-git.inc
|
||||
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.11
|
||||
# 5.11.meta-qt5.5
|
||||
# 5.11.meta-qt5.6
|
||||
SRC_URI += " \
|
||||
file://0001-Allow-a-tools-only-build.patch \
|
||||
"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a67b00eb05abcb5242ee21049400a1e4a033389f Mon Sep 17 00:00:00 2001
|
||||
From 028ec1bdce6dde67cc1486e5bee311b69354e41e Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Francis <alistair.francis@wdc.com>
|
||||
Date: Wed, 18 Jul 2018 14:26:21 -0700
|
||||
Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b7517ed7b952f696ae8206b1b68e47a1f1a9d020 Mon Sep 17 00:00:00 2001
|
||||
From e9b8d8d23681cfef9efbb654ecea2eeb128a9d00 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 23 Aug 2018 02:58:14 +0000
|
||||
Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems
|
||||
|
||||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscript/commits/b5.11
|
||||
# 5.11.meta-qt5.1
|
||||
# 5.11.meta-qt5.2
|
||||
SRC_URI += " \
|
||||
file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch \
|
||||
file://0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From dd3b009e234f06a58052b322ce48c4f2ae995efb Mon Sep 17 00:00:00 2001
|
||||
From ed4d6708cc72311f697d6d27556de7dfc77cfcd0 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 10 Jan 2017 15:28:26 +0200
|
||||
Subject: [PATCH] Use external host bin path for cmake file
|
||||
|
||||
@@ -13,7 +13,7 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
SRCREV = "b99d699a8e1fe1a2968edafa6f0154a2581c2143"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11
|
||||
# 5.11.meta-qt5.5
|
||||
# 5.11.meta-qt5.6
|
||||
SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
|
||||
|
||||
do_install_append_class-nativesdk() {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0b044a142361de5dd100d33af339c04e35bdff3c Mon Sep 17 00:00:00 2001
|
||||
From 9cdaa2696552e90bac815889bf6fe45bc9637ca1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 4 Jun 2014 11:28:16 +0200
|
||||
Subject: [PATCH] add noqtwebkit configuration
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3c31d0dad9c513a19618a1d0ee0fec076056358c Mon Sep 17 00:00:00 2001
|
||||
From 1b52ee8efd23b61cae9ab843efd75ced21fed04f Mon Sep 17 00:00:00 2001
|
||||
From: Cody P Schafer <dev@codyps.com>
|
||||
Date: Thu, 9 Jul 2015 11:28:19 -0400
|
||||
Subject: [PATCH] linguist-tools cmake: allow overriding the location for
|
||||
|
||||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qttools/commits/b5.11
|
||||
# 5.11.meta-qt5.5
|
||||
# 5.11.meta-qt5.6
|
||||
SRC_URI += " \
|
||||
file://0001-add-noqtwebkit-configuration.patch \
|
||||
file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
|
||||
|
||||
Reference in New Issue
Block a user