Skip to contentSkip to conversation

package/qt5base: fix another gcc-11 compile failure

PATCH New Peter Seiderer 2 participants 2 messages Jul 17, 2021 – Jul 18, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5base: fix another gcc-11 compile failure

- add upstream patch fixing gcc-11 compile failure (missing limits include)

Fixes:

In file included from ../../../include/QtCore/5.15.2/QtCore/private/qoffsetstringarray_p.h:1,

                   from ../../dbus/qdbuserror.cpp:44:
  ../../../src/corelib/tools/qoffsetstringarray_p.h:70:22: error: ?numeric_limits? is not a member of ?std?
     70 |         Last <= std::numeric_limits<quint8>::max(),
        |                      ^~~~~~~~~~~~~~
  ../../../src/corelib/tools/qoffsetstringarray_p.h:70:43: error: wrong number of template arguments (1, should be 3)
     70 |         Last <= std::numeric_limits<quint8>::max(),
        |                                           ^
---
 .../0008-Add-missing-limits-include.patch     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch
package/qt5/qt5base/0008-Add-missing-limits-include.patch new file +32 -0
new file mode 100644
index 0000000000..e489f2e551
@@ -0,0 +1,32 @@
+From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <[email protected]>
+Date: Sun, 20 Jun 2021 17:36:41 +0200
+Subject: [PATCH] Add missing limits include
+
+The code uses std::numeric_limits but is lacking the appropriate include
+
+Pick-to: 5.15 6.1 6.2
+Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd
+Reviewed-by: Giuseppe D'Angelo <[email protected]>
+
+[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ src/corelib/tools/qoffsetstringarray_p.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
+index 4dd9e960..e26a57ff 100644
+--- a/src/corelib/tools/qoffsetstringarray_p.h
++++ b/src/corelib/tools/qoffsetstringarray_p.h
+@@ -55,6 +55,7 @@
+ 
+ #include <tuple>
+ #include <array>
++#include <limits>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-- 
+2.32.0
+
Signature · 1 line
2.32.0
#1 lore raw

PATCH 1/1 package/qt5base: fix another gcc-11 compile failure

Peter, All,

On 2021-07-18 00:08 +0200, Peter Seiderer spake thusly:

Quoted 14 lines

- add upstream patch fixing gcc-11 compile failure (missing limits include)

Fixes:

In file included from ../../../include/QtCore/5.15.2/QtCore/private/qoffsetstringarray_p.h:1,

                   from ../../dbus/qdbuserror.cpp:44:
  ../../../src/corelib/tools/qoffsetstringarray_p.h:70:22: error: ?numeric_limits? is not a member of ?std?
     70 |         Last <= std::numeric_limits<quint8>::max(),
        |                      ^~~~~~~~~~~~~~
  ../../../src/corelib/tools/qoffsetstringarray_p.h:70:43: error: wrong number of template arguments (1, should be 3)
     70 |         Last <= std::numeric_limits<quint8>::max(),
        |                                           ^
Quoted 1 line

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 50 lines
---
 .../0008-Add-missing-limits-include.patch     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch
package/qt5/qt5base/0008-Add-missing-limits-include.patch new file +32 -0
new file mode 100644
index 0000000000..e489f2e551
@@ -0,0 +1,32 @@
+From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <[email protected]>
+Date: Sun, 20 Jun 2021 17:36:41 +0200
+Subject: [PATCH] Add missing limits include
+
+The code uses std::numeric_limits but is lacking the appropriate include
+
+Pick-to: 5.15 6.1 6.2
+Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd
+Reviewed-by: Giuseppe D'Angelo <[email protected]>
+
+[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ src/corelib/tools/qoffsetstringarray_p.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
+index 4dd9e960..e26a57ff 100644
+--- a/src/corelib/tools/qoffsetstringarray_p.h
++++ b/src/corelib/tools/qoffsetstringarray_p.h
+@@ -55,6 +55,7 @@
+ 
+ #include <tuple>
+ #include <array>
++#include <limits>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-- 
+2.32.0
+
Signature · 6 lines
2.32.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'