From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] qt5: fix missing limits includes in qtdeclarative with GCC 11
Date: Fri, 10 Dec 2021 14:07:06 +0100 [thread overview]
Message-ID: <20211210130706.3900072-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20211201134037.1086230-1-bst@pengutronix.de>
Thanks, applied as afa4fa1d1d79fcf43b41a21e6ef2684b9a17e20d.
Michael
[sent from post-receive hook]
On Fri, 10 Dec 2021 14:07:05 +0100, Bastian Krause <bst@pengutronix.de> wrote:
> Fixes these build errors:
>
> In file included from qt-everywhere-src-5.15.2/qtdeclarative/src/qmldebug/qqmlprofilereventreceiver_p.h:43,
> from moc_qqmlprofilereventreceiver_p.cpp:10:
> qt-everywhere-src-5.15.2/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h: In member function 'void QQmlProfilerEvent::assignNumbers(const Container&)':
> qt-everywhere-src-5.15.2/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h:314:65: error: 'numeric_limits' is not a member of 'std'
> qt-everywhere-src-5.15.2/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h:314:87: error: expected primary-expression before '>' token
> qt-everywhere-src-5.15.2/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h:314:90: error: '::max' has not been declared; did you mean 'std::max'?
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20211201134037.1086230-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/qt-everywhere-src-5.15.2/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch b/patches/qt-everywhere-src-5.15.2/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch
> new file mode 100644
> index 000000000000..05a0b6726bc7
> --- /dev/null
> +++ b/patches/qt-everywhere-src-5.15.2/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch
> @@ -0,0 +1,31 @@
> +From: Antonio Rojas <arojas@archlinux.org>
> +Date: Sun, 23 May 2021 14:32:46 +0200
> +Subject: [PATCH] qtdeclarative: Add missing limits include to fix build with
> + GCC 11
> +
> +This is not required for Qt 6, since it is indirectly pulled via
> +qanystrigview.h, but it is for Qt 5 (where qanystrigview does
> +not exist) and, in any case, it is good to declare all used headers
> +and not rely on them being implicitly pulled.
> +
> +Upstream fix: https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=367293b18a
> +
> +Pick-to: 6.1 5.15
> +Change-Id: I97606ea493e723006759608b7d4c4f00632f340c
> +Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
> +---
> + qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h b/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
> +index a7e37d196427..01b2f58f1651 100644
> +--- a/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
> ++++ b/qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
> +@@ -48,6 +48,7 @@
> + #include <QtCore/qmetatype.h>
> +
> + #include <initializer_list>
> ++#include <limits>
> + #include <type_traits>
> +
> + //
> diff --git a/patches/qt-everywhere-src-5.15.2/series b/patches/qt-everywhere-src-5.15.2/series
> index 226529352040..6f9c1ab37966 100644
> --- a/patches/qt-everywhere-src-5.15.2/series
> +++ b/patches/qt-everywhere-src-5.15.2/series
> @@ -8,4 +8,5 @@
> 0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
> 0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
> 0008-qtbase-include-limits-where-necessary.patch
> -# 0339a08cc8ad82af4c6542508057d7e7 - git-ptx-patches magic
> +0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch
> +# f48701510a7b265918cc79b1cc68a359 - git-ptx-patches magic
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-12-10 13:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 13:40 [ptxdist] [PATCH] " Bastian Krause
2021-12-10 13:07 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211210130706.3900072-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=bst@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox