[qt] Add patches to fix missing includes (#19668)

* [qt] Add patches to fix missing includes

This is needed to build with GCC11

Fixes #19226

* bump version

* version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Nicolas Fella 2021-09-16 19:34:42 +02:00 committed by GitHub
parent c32e7e262d
commit e14842c446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 91 additions and 5 deletions

View File

@ -0,0 +1,51 @@
From 61325e4547225b8b2ecefda4ca328a38c075c909 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Wed, 11 Aug 2021 15:35:05 +0200
Subject: [PATCH] Add missing limits include
---
src/corelib/global/qendian.h | 1 +
src/corelib/global/qfloat16.h | 1 +
src/corelib/text/qbytearraymatcher.h | 2 ++
3 files changed, 4 insertions(+)
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
index 257efbbdbe..05f11d6f81 100644
--- a/src/corelib/global/qendian.h
+++ b/src/corelib/global/qendian.h
@@ -47,6 +47,7 @@
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
#include <stdlib.h>
#include <string.h>
+#include <limits>
#ifdef min // MSVC
#undef min
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
index c7a9c87af3..3287d7cbf2 100644
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -44,6 +44,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qmetatype.h>
#include <string.h>
+#include <limits>
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
// All processors that support AVX2 do support F16C too. That doesn't mean
diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
index 0eedfc1d20..f5f9bef7b8 100644
--- a/src/corelib/text/qbytearraymatcher.h
+++ b/src/corelib/text/qbytearraymatcher.h
@@ -42,6 +42,8 @@
#include <QtCore/qbytearray.h>
+#include <limits>
+
QT_BEGIN_NAMESPACE
--
2.32.0

View File

@ -87,6 +87,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
#CMake fixes
${PATCHES}
patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt
patches/limits_include.patch # Add missing includes to build with gcc 11
)
# Remove vendored dependencies to ensure they are not picked up by the build

View File

@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version-semver": "5.15.2",
"port-version": 10,
"port-version": 11,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [

View File

@ -0,0 +1,24 @@
From 2dfb893c130a9f9195805fcc81d7e5e242bc558d Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Wed, 11 Aug 2021 17:03:06 +0200
Subject: [PATCH] Add missing limits include
---
src/qmldebug/qqmlprofilerevent_p.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
index a7e37d1964..01b2f58f16 100644
--- a/src/qmldebug/qqmlprofilerevent_p.h
+++ b/src/qmldebug/qqmlprofilerevent_p.h
@@ -48,6 +48,7 @@
#include <QtCore/qmetatype.h>
#include <initializer_list>
+#include <limits>
#include <type_traits>
//
--
2.32.0

View File

@ -1,2 +1,2 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation()
qt_submodule_installation(PATCHES limits_include.patch)

View File

@ -1,7 +1,7 @@
{
"name": "qt5-declarative",
"version-string": "5.15.2",
"port-version": 1,
"port-version": 2,
"description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
"dependencies": [
{

View File

@ -5314,7 +5314,7 @@
},
"qt5-base": {
"baseline": "5.15.2",
"port-version": 10
"port-version": 11
},
"qt5-canvas3d": {
"baseline": "0",
@ -5334,7 +5334,7 @@
},
"qt5-declarative": {
"baseline": "5.15.2",
"port-version": 1
"port-version": 2
},
"qt5-doc": {
"baseline": "5.15.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "72ca286ac98e08f2fef35f85a6e393795428d033",
"version-semver": "5.15.2",
"port-version": 11
},
{
"git-tree": "13593d8640bdca2663ba5bd497243274e51c4dc3",
"version-semver": "5.15.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0cef09afb36f9debf22319dc4adccf478c611885",
"version-string": "5.15.2",
"port-version": 2
},
{
"git-tree": "bf4313e778b98d69d3e0e3b881069357c3ef8b76",
"version-string": "5.15.2",