Skip to contentSkip to conversation

package/qt5/qt5base: fix build with gcc 11

PATCH Superseded Maxim Kochetkov 2 participants 3 messages Jul 5, 2021

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/qt5/qt5base: fix build with gcc 11

Fix the following build failure with gcc 11:

text/qbytearraymatcher.h:103:38: error: 'numeric_limits' is not a member of 'std'

  103 |         const auto uchar_max = (std::numeric_limits<uchar>::max)();
      |                                      ^~~~~~~~~~~~~~
---
 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +62 -0
new file mode 100644
index 0000000000..789983a81e
@@ -0,0 +1,62 @@
+From e4b1895bc8d02060d41a203f8503402f7a396de5 Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <[email protected]>
+Date: Mon, 18 Jan 2021 09:58:17 +0200
+Subject: [PATCH] Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <[email protected]>
+Reviewed-by: Thiago Macieira <[email protected]>
+[Retrieved (and backported) from:
+https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
+Signed-off-by: Maxim Kochetkov <[email protected]>
+Tested-by: Peter Seiderer <[email protected]>
+---
+ src/corelib/text/qbytearraymatcher.h     | 2 ++
+ src/corelib/tools/qsharedpointer_impl.h  | 3 ---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d20..f5f9bef7b8 100644
+--- 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/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..4aee98af53 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+         inline void checkQObjectShared(...) { }
+         inline void setQObjectShared(...) { }
+-
+-        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+-        inline void operator delete(void *, void *) { }
+     };
+     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+ 
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9e7e1a5572..f0866a90ac 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+         if (isTransient(window())) {
+             const QWindow *tp = window()->transientParent();
+             if (tp && tp->handle())
+-                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
++                transientXcbParent = tp->handle()->winId();
+             // Default to client leader if there is no transient parent, else modal dialogs can
+             // be hidden by their parents.
+             if (!transientXcbParent)
+-- 
+2.31.1
+
Signature · 1 line
2.31.1
#1 lore raw

PATCH v2 1/1 package/qt5/qt5base: fix build with gcc 11

Hello Maxim,

thanks for the new patch iteration...., but:

Quoted 7 lines · Maxim Kochetkov

Fix the following build failure with gcc 11:

text/qbytearraymatcher.h:103:38: error: 'numeric_limits' is not a member of 'std'

  103 |         const auto uchar_max = (std::numeric_limits<uchar>::max)();
      |                                      ^~~~~~~~~~~~~~

My tested-by should go here...

Quoted 1 line

---

A patch revision changelog here would be nice (see '22.5.5. Patch revision changelog' [1])...

Quoted 13 lines
 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +3 -0
new file mode 100644
index 0000000000..789983a81e
@@ -0,0 +1,62 @@
+From e4b1895bc8d02060d41a203f8503402f7a396de5 Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <[email protected]>
+Date: Mon, 18 Jan 2021 09:58:17 +0200

package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch line 13

Quoted 10 lines
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +10 -0
+Subject: [PATCH] Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <[email protected]>
+Reviewed-by: Thiago Macieira <[email protected]>
+[Retrieved (and backported) from:
+https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
+Signed-off-by: Maxim Kochetkov <[email protected]>
+Tested-by: Peter Seiderer <[email protected]>

Not here...

Regards,
Peter

[1] https://buildroot.org/downloads/manual/manual.html#submitting-patches

Quoted 49 lines
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +49 -0
+---
+ src/corelib/text/qbytearraymatcher.h     | 2 ++
+ src/corelib/tools/qsharedpointer_impl.h  | 3 ---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d20..f5f9bef7b8 100644
+--- 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/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..4aee98af53 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+         inline void checkQObjectShared(...) { }
+         inline void setQObjectShared(...) { }
+-
+-        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+-        inline void operator delete(void *, void *) { }
+     };
+     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9e7e1a5572..f0866a90ac 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+         if (isTransient(window())) {
+             const QWindow *tp = window()->transientParent();
+             if (tp && tp->handle())
+-                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
++                transientXcbParent = tp->handle()->winId();
+             // Default to client leader if there is no transient parent, else modal dialogs can
+             // be hidden by their parents.
+             if (!transientXcbParent)
+--
+2.31.1
+
#2 lore raw

PATCH v2 1/1 package/qt5/qt5base: fix build with gcc 11

Quoted 12 lines · Peter Seiderer

Hello Maxim,

thanks for the new patch iteration...., but:

Quoted 6 lines · Maxim Kochetkov

Fix the following build failure with gcc 11:

text/qbytearraymatcher.h:103:38: error: 'numeric_limits' is not a member of 'std'

  103 |         const auto uchar_max = (std::numeric_limits<uchar>::max)();
      |                                      ^~~~~~~~~~~~~~
Quoted 7 lines
Quoted 1 line

My tested-by should go here...

Quoted 1 line

---

A patch revision changelog here would be nice (see '22.5.5. Patch revision changelog' [1])...

e.g.:

Changes v1 -> v2:
- re-generated 0007-Build-fixes-for-GCC-11.patch with 'git format-patch -N'

Quoted 18 lines
Quoted 18 lines
 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +7 -0
new file mode 100644
index 0000000000..789983a81e
@@ -0,0 +1,62 @@
+From e4b1895bc8d02060d41a203f8503402f7a396de5 Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <[email protected]>
+Date: Mon, 18 Jan 2021 09:58:17 +0200
+Subject: [PATCH] Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
Quoted 8 lines

package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch line 13

Quoted 6 lines
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +6 -0
+Reviewed-by: Lars Knoll <[email protected]>
+Reviewed-by: Thiago Macieira <[email protected]>
+[Retrieved (and backported) from:
+https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
+Signed-off-by: Maxim Kochetkov <[email protected]>
+Tested-by: Peter Seiderer <[email protected]>

Not here...

For patches without new patch iteration the tested-by/reviewed-by etc. tags a picked up automatically by patchwork, see e.g. [2]/[3]

Regards,
Peter

[2] https://patchwork.ozlabs.org/project/buildroot/patch/20210702080247.211116-1-fido_max at inbox.ru/
[3] https://patchwork.ozlabs.org/project/buildroot/patch/20210702080247.211116-1-fido_max at inbox.ru/mbox/

Quoted 61 lines

Regards,
Peter

[1] https://buildroot.org/downloads/manual/manual.html#submitting-patches

Quoted 39 lines
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +39 -0
+---
+ src/corelib/text/qbytearraymatcher.h     | 2 ++
+ src/corelib/tools/qsharedpointer_impl.h  | 3 ---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d20..f5f9bef7b8 100644
+--- 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/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..4aee98af53 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+         inline void checkQObjectShared(...) { }
+         inline void setQObjectShared(...) { }
+-
+-        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+-        inline void operator delete(void *, void *) { }
+     };
+     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9e7e1a5572..f0866a90ac 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+         if (isTransient(window())) {

package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch line 62

Quoted 10 lines
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch new file +10 -0
+             const QWindow *tp = window()->transientParent();
+             if (tp && tp->handle())
+-                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
++                transientXcbParent = tp->handle()->winId();
+             // Default to client leader if there is no transient parent, else modal dialogs can
+             // be hidden by their parents.
+             if (!transientXcbParent)
+--
+2.31.1
+

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot