From 74a25bc9215ea92bda0099171f07974906667106 Mon Sep 17 00:00:00 2001
From: HoldOnBro <357835338@qq.com>
Date: Tue, 20 Jul 2021 10:02:11 +0800
Subject: [PATCH] qt: Update to 5.15.2 (#7444)

* Update Makefile

* Update Makefile

* Create 010-gcc11.patch
---
 package/lean/qtbase/Makefile                |  4 +--
 package/lean/qtbase/patches/010-gcc11.patch | 36 +++++++++++++++++++++
 package/lean/qttools/Makefile               |  4 +--
 3 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 package/lean/qtbase/patches/010-gcc11.patch

diff --git a/package/lean/qtbase/Makefile b/package/lean/qtbase/Makefile
index 7afbba51b..dea0c41bf 100644
--- a/package/lean/qtbase/Makefile
+++ b/package/lean/qtbase/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qtbase
 PKG_BASE:=5.15
-PKG_BUGFIX:=1
+PKG_BUGFIX:=2
 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
 PKG_RELEASE:=1
 
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:= \
 		http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
-PKG_HASH:=33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c
+PKG_HASH:=909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)
 
diff --git a/package/lean/qtbase/patches/010-gcc11.patch b/package/lean/qtbase/patches/010-gcc11.patch
new file mode 100644
index 000000000..97d277e03
--- /dev/null
+++ b/package/lean/qtbase/patches/010-gcc11.patch
@@ -0,0 +1,36 @@
+diff --color -uNr a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
+--- a/src/corelib/global/qendian.h	2020-10-27 16:02:11.000000000 +0800
++++ b/src/corelib/global/qendian.h	2021-07-19 06:21:23.185297425 +0800
+@@ -43,7 +43,7 @@
+ 
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+-
++#include <limits>
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
+diff --color -uNr a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
+--- a/src/corelib/global/qfloat16.h	2020-10-27 16:02:11.000000000 +0800
++++ b/src/corelib/global/qfloat16.h	2021-07-19 06:22:10.387349829 +0800
+@@ -44,7 +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
+ // we're allowed to use the intrinsics directly, so we'll do it only for
+diff --color -uNr a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
+--- a/src/corelib/text/qbytearraymatcher.h	2020-10-27 16:02:11.000000000 +0800
++++ b/src/corelib/text/qbytearraymatcher.h	2021-07-19 06:22:30.139372013 +0800
+@@ -41,7 +41,7 @@
+ #define QBYTEARRAYMATCHER_H
+ 
+ #include <QtCore/qbytearray.h>
+-
++#include <limits>
+ QT_BEGIN_NAMESPACE
+ 
+ 
diff --git a/package/lean/qttools/Makefile b/package/lean/qttools/Makefile
index b5240d7a1..4fe80cabf 100644
--- a/package/lean/qttools/Makefile
+++ b/package/lean/qttools/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qttools
 PKG_BASE:=5.15
-PKG_BUGFIX:=1
+PKG_BUGFIX:=2
 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
 PKG_RELEASE:=1
 
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:= \
 		http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
-PKG_HASH:=c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498
+PKG_HASH:=c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)