mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lucas Stach <l.stach@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] qt5: extend GCC11 build fix
Date: Tue, 29 Jun 2021 07:09:20 +0200	[thread overview]
Message-ID: <20210629050920.2524083-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210618183455.9037-1-l.stach@pengutronix.de>

Thanks, applied as 5e6e844e2161eb3154f95258c81109d0a83dce82.

Michael

[sent from post-receive hook]

On Tue, 29 Jun 2021 07:09:20 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> One more instance of missing <limits> include has been found while
> building with a target GCC11. Extend the last patch to fix this.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210618183455.9037-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
> index 33138cc3623c..a7b82435a5ed 100644
> --- a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
> +++ b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
> @@ -15,7 +15,8 @@ Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
>   qtbase/src/corelib/global/qfloat16.h            | 1 +
>   qtbase/src/corelib/text/qbytearraymatcher.h     | 2 ++
>   qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 +
> - 4 files changed, 6 insertions(+)
> + qtdeclarative/src/3rdparty/masm/yarr/Yarr.h     | 2 ++
> + 5 files changed, 8 insertions(+)
>  
>  diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h
>  index 257efbbdbecf..a97776c761b7 100644
> @@ -67,3 +68,16 @@ index 4dd9e9603bc1..8b3fbfe55985 100644
>   #include <tuple>
>   #include <array>
>   
> +diff --git a/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h b/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h
> +index ccf78f988000..cd745256e9e1 100644
> +--- a/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h
> ++++ b/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h
> +@@ -27,6 +27,8 @@
> + 
> + #pragma once
> + 
> ++#include <limits>
> ++
> + #include <limits.h>
> + #include "YarrErrorCode.h"
> + 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


      parent reply	other threads:[~2021-06-29  5:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 18:34 [ptxdist] [PATCH 1/2] " Lucas Stach
2021-06-18 18:34 ` [ptxdist] [PATCH 2/2] gst-plugins-good1: fix build with GCC11 Lucas Stach
2021-06-29  5:09   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-29  5:09 ` 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=20210629050920.2524083-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=l.stach@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