[neon/qt/qtdeclarative/Neon/release] debian: Amend gcc_11.patch with one more fix for GCC 11.

Dmitry Shachnev null at kde.org
Thu May 5 11:48:35 BST 2022


Git commit d67a585fca292e62e1ff41fb61f37b2a6bfb24f1 by Dmitry Shachnev.
Committed on 09/08/2021 at 17:58.
Pushed by jriddell into branch 'Neon/release'.

Amend gcc_11.patch with one more fix for GCC 11.

Closes: #984313.

M  +3    -0    debian/changelog
M  +14   -2    debian/patches/gcc_11.patch

https://invent.kde.org/neon/qt/qtdeclarative/commit/d67a585fca292e62e1ff41fb61f37b2a6bfb24f1

diff --git a/debian/changelog b/debian/changelog
index af32215..72214f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtdeclarative-opensource-src (5.15.2+dfsg-7) UNRELEASED; 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).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Jun 2021 10:17:27 -0300
 
 qtdeclarative-opensource-src (5.15.2+dfsg-6) unstable; urgency=medium
diff --git a/debian/patches/gcc_11.patch b/debian/patches/gcc_11.patch
index b5b2cf4..f1eaab3 100644
--- a/debian/patches/gcc_11.patch
+++ b/debian/patches/gcc_11.patch
@@ -1,6 +1,8 @@
 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-09
 
 --- a/src/qml/compiler/qv4bytecodegenerator_p.h
 +++ b/src/qml/compiler/qv4bytecodegenerator_p.h
@@ -20,3 +22,13 @@ Last-Update: 2021-01-26
          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>
+ 
+ //



More information about the Neon-commits mailing list