[neon/qt/qtbase/Neon/testing] debian: Backport upstream changes to add #include <limits> for GCC 11.

Dmitry Shachnev null at kde.org
Tue May 18 11:01:29 BST 2021


Git commit 6e29aa7dc8fe53ebc4da9ef923c7bc438b9f5c8d by Dmitry Shachnev.
Committed on 26/01/2021 at 12:52.
Pushed by sitter into branch 'Neon/testing'.

Backport upstream changes to add #include <limits> for GCC 11.

M  +1    -0    debian/changelog
A  +38   -0    debian/patches/gcc_11_limits.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/6e29aa7dc8fe53ebc4da9ef923c7bc438b9f5c8d

diff --git a/debian/changelog b/debian/changelog
index 0815732..fd1b8e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.15.2+dfsg-3) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Backport upstream patch to fix memory leak in QNetworkAccessManager
     from QMetaObjectPrivate::connect.
+  * Backport upstream changes to add #include <limits> for GCC 11.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Jan 2021 15:30:33 +0300
 
diff --git a/debian/patches/gcc_11_limits.diff b/debian/patches/gcc_11_limits.diff
new file mode 100644
index 0000000..9d39131
--- /dev/null
+++ b/debian/patches/gcc_11_limits.diff
@@ -0,0 +1,38 @@
+Description: include <limits> to fix some GCC 11 build issues
+Origin: upstream, commits:
+ https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
+ https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
+Last-Update: 2021-01-26
+
+--- a/src/corelib/global/qendian.h
++++ b/src/corelib/global/qendian.h
+@@ -44,6 +44,8 @@
+ #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>
+--- a/src/corelib/global/qfloat16.h
++++ b/src/corelib/global/qfloat16.h
+@@ -43,6 +43,7 @@
+ 
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+ 
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
+--- 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
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4b4f79a..81118c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # Backported from upstream.
 xcb_screens_uaf.patch
 qnam_connect_memory_leak.diff
+gcc_11_limits.diff
 
 # Debian specific.
 gnukfreebsd.diff



More information about the Neon-commits mailing list