[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-310-g40cf2cfb2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-310-g40cf2cfb2
|
From: Sébastien S. <ss...@us...> - 2022-02-17 13:32:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 40cf2cfb2e76c7d33a7389b6e3de4b6bd7ef0297 (commit)
from 72d21fabc5c43a8b85490f0d61c876660ecf5861 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 40cf2cfb2e76c7d33a7389b6e3de4b6bd7ef0297
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 17 14:15:54 2022 +0100
[BUILDROOT] 2021.02: patches for qt5base
Fixes build failures.
-----------------------------------------------------------------------
Summary of changes:
...package-qt5-qt5base-fix-build-with-gcc-11.patch | 89 ++++++++++++++++++++++
...t5base-fix-another-gcc-11-compile-failure.patch | 70 +++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 2 +
3 files changed, 161 insertions(+)
create mode 100644 patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch
create mode 100644 patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch
diff --git a/patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch b/patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch
new file mode 100644
index 000000000..3834d2612
--- /dev/null
+++ b/patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch
@@ -0,0 +1,89 @@
+From 7bd57831e991ea1239687b83cc94b306f21b9031 Mon Sep 17 00:00:00 2001
+From: Maxim Kochetkov <fid...@in...>
+Date: Tue, 6 Jul 2021 07:29:02 +0300
+Subject: [PATCH 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)();
+ | ^~~~~~~~~~~~~~
+
+Signed-off-by: Maxim Kochetkov <fid...@in...>
+Tested-by: Peter Seiderer <ps....@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ .../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 <vil...@qt...>
++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 <lar...@qt...>
++Reviewed-by: Thiago Macieira <thi...@in...>
++[Retrieved (and backported) from:
++https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
++Signed-off-by: Maxim Kochetkov <fid...@in...>
++---
++ 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.34.1
+
diff --git a/patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch b/patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch
new file mode 100644
index 000000000..b455ea582
--- /dev/null
+++ b/patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch
@@ -0,0 +1,70 @@
+From 6202ba67b74e9de7099df8b98e3db8d33490996a Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps....@gm...>
+Date: Sun, 18 Jul 2021 00:08:09 +0200
+Subject: [PATCH 1/1] package/qt5base: fix another gcc-11 compile failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 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(),
+ | ^
+
+Signed-off-by: Peter Seiderer <ps....@gm...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ .../0008-Add-missing-limits-include.patch | 32 +++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+ create mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch
+
+diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
+new file mode 100644
+index 0000000000..e489f2e551
+--- /dev/null
++++ b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
+@@ -0,0 +1,32 @@
++From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001
++From: Nicolas Fella <nic...@kd...>
++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 <giu...@kd...>
++
++[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b]
++Signed-off-by: Peter Seiderer <ps....@gm...>
++---
++ 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
++
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index d3e71f53a..56fb8e557 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -113,6 +113,8 @@ rm -rf buildroot/package/python/Config.in
rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
+rm -rf buildroot/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
+rm -rf buildroot/package/qt5/qt5base/0008-Add-missing-limits-include.patch
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
hooks/post-receive
--
armadeus
|