diff -Nru qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog
--- qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog	2021-06-01 21:37:21.000000000 +0000
+++ qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog	2021-08-18 11:21:46.000000000 +0000
@@ -1,6 +1,22 @@
+qtdeclarative-opensource-src (5.15.2+dfsg-8) unstable; urgency=medium
+
+  * Include <limits> in Yarr.h to fix FTBFS with GCC 11 on arm64 and i386.
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Wed, 18 Aug 2021 14:21:46 +0300
+
+qtdeclarative-opensource-src (5.15.2+dfsg-7) unstable; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Fix typos in previous changelog entry.
+
+  [ Dmitry Shachnev ]
+  * Amend gcc_11.patch with one more fix for GCC 11 (closes: #984313).
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Mon, 16 Aug 2021 12:02:36 +0300
+
 qtdeclarative-opensource-src (5.15.2+dfsg-6) unstable; urgency=medium
 
-  * Backport patch to support &appos in styled text, along with it's
+  * Backport patch to support &apos in styled text, along with its
     documentation.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Tue, 01 Jun 2021 18:37:21 -0300
diff -Nru qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/gcc_11.patch qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/gcc_11.patch
--- qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/gcc_11.patch	2021-06-01 21:36:28.000000000 +0000
+++ qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/gcc_11.patch	2021-08-18 11:21:46.000000000 +0000
@@ -1,7 +1,19 @@
 Description: build fixes for GCC 11
-Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=eb6525f126f680f9
-Last-Update: 2021-01-26
+Origin: upstream, commits:
+ https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=eb6525f126f680f9
+ https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=367293b18ab0d0a0
+Last-Update: 2021-08-18
 
+--- a/src/3rdparty/masm/yarr/Yarr.h
++++ b/src/3rdparty/masm/yarr/Yarr.h
+@@ -28,6 +28,7 @@
+ #pragma once
+ 
+ #include <limits.h>
++#include <limits>
+ #include "YarrErrorCode.h"
+ 
+ namespace JSC { namespace Yarr {
 --- a/src/qml/compiler/qv4bytecodegenerator_p.h
 +++ b/src/qml/compiler/qv4bytecodegenerator_p.h
 @@ -186,13 +186,13 @@ QT_WARNING_POP
@@ -20,3 +32,13 @@
          return addJumpInstruction(data);
      }
  
+--- 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>
+ 
+ //