From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 Dec 2021 14:08:02 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mvfd4-0024bh-5A for lore@lore.pengutronix.de; Fri, 10 Dec 2021 14:08:02 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mvfd2-0006DY-Ga; Fri, 10 Dec 2021 14:08:00 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mvfcB-0005Y2-NH; Fri, 10 Dec 2021 14:07:07 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1mvfcB-003mOH-NR; Fri, 10 Dec 2021 14:07:07 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1mvfcA-00GMd0-2c; Fri, 10 Dec 2021 14:07:06 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 10 Dec 2021 14:07:06 +0100 Message-Id: <20211210130706.3900072-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211201134037.1086230-1-bst@pengutronix.de> References: <20211201134037.1086230-1-bst@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] qt5: fix missing limits includes in qtdeclarative with GCC 11 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bastian Krause Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as afa4fa1d1d79fcf43b41a21e6ef2684b9a17e20d. Michael [sent from post-receive hook] On Fri, 10 Dec 2021 14:07:05 +0100, Bastian Krause 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 > Message-Id: <20211201134037.1086230-1-bst@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 > +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 > +--- > + 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 > + > + #include > ++#include > + #include > + > + // > 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