* [Buildroot] [PATCH v3] package/qt5/qt5base: fix build with gcc 11
@ 2021-07-06 4:29 Maxim Kochetkov
2021-07-17 8:03 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Maxim Kochetkov @ 2021-07-06 4:29 UTC (permalink / raw)
To: buildroot
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)();
| ^~~~~~~~~~~~~~
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Tested-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v2 -> v3:
- Removed "Tested-by" from 0007-Build-fixes-for-GCC-11.patch
Changes v1 -> v2:
- re-generated 0007-Build-fixes-for-GCC-11.patch with 'git format-patch -N'
.../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 +++++++++++++++++++
1 file changed, 61 insertions(+)
create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
new file mode 100644
index 0000000000..d20600c6ce
--- /dev/null
+++ b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
@@ -0,0 +1,61 @@
+From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <ville.voutilainen@qt.io>
+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 <lars.knoll@qt.io>
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+[Retrieved (and backported) from:
+https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
+Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
+---
+ 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.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH v3] package/qt5/qt5base: fix build with gcc 11
2021-07-06 4:29 [Buildroot] [PATCH v3] package/qt5/qt5base: fix build with gcc 11 Maxim Kochetkov
@ 2021-07-17 8:03 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2021-07-17 8:03 UTC (permalink / raw)
To: buildroot
On Tue, 6 Jul 2021 07:29:02 +0300
Maxim Kochetkov via buildroot <buildroot@busybox.net> wrote:
> 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)();
> | ^~~~~~~~~~~~~~
>
> Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
> Tested-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v2 -> v3:
> - Removed "Tested-by" from 0007-Build-fixes-for-GCC-11.patch
Applied to master, thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-17 8:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 4:29 [Buildroot] [PATCH v3] package/qt5/qt5base: fix build with gcc 11 Maxim Kochetkov
2021-07-17 8:03 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.