[neon/qt/qtbase/Neon/release] debian: Remove most of gcc_11_limits.diff, only one change left.

Dmitry Shachnev null at kde.org
Thu May 5 10:59:26 BST 2022


Git commit a66dde9c5c8417c8dd8e31ee618e18b50abae87f by Dmitry Shachnev.
Committed on 03/03/2022 at 19:25.
Pushed by jriddell into branch 'Neon/release'.

Remove most of gcc_11_limits.diff, only one change left.

M  +1    -0    debian/changelog
M  +3    -26   debian/patches/gcc_11_limits.diff

https://invent.kde.org/neon/qt/qtbase/commit/a66dde9c5c8417c8dd8e31ee618e18b50abae87f

diff --git a/debian/changelog b/debian/changelog
index ac3c6f9..8036857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.15.3+dfsg-1) UNRELEASED; urgency=medium
     - xcb_screens_uaf.patch
     - qnam_connect_memory_leak.diff
     - qiodevice_readline_memory.diff
+  * Remove most of gcc_11_limits.diff, only one change left.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Mar 2022 22:13:09 +0300
 
diff --git a/debian/patches/gcc_11_limits.diff b/debian/patches/gcc_11_limits.diff
index 9d39131..c254e12 100644
--- a/debian/patches/gcc_11_limits.diff
+++ b/debian/patches/gcc_11_limits.diff
@@ -1,30 +1,7 @@
-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
+Description: include <limits> to fix GCC 11 build
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
+Last-Update: 2022-03-03
 
---- 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 @@



More information about the Neon-commits mailing list