From patchwork Mon Jul 5 13:15:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1500736 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=inbox.ru header.i=@inbox.ru header.a=rsa-sha256 header.s=mail3 header.b=OU0UG5eB; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GJR3K1PJgz9sWS for ; Mon, 5 Jul 2021 23:14:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 27A474034C; Mon, 5 Jul 2021 13:14:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ni8SSFkA8IJb; Mon, 5 Jul 2021 13:13:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 32F2840362; Mon, 5 Jul 2021 13:13:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7683A1BF324 for ; Mon, 5 Jul 2021 13:13:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 723B740379 for ; Mon, 5 Jul 2021 13:13:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=inbox.ru Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NYSRKhKZAcg4 for ; Mon, 5 Jul 2021 13:13:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [94.100.177.108]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8AB3F402DC for ; Mon, 5 Jul 2021 13:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail3; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=78tOe22qVWe2n5goh63MW2vV2GLA/ywMkSOn5n1rBJE=; t=1625490833;x=1626096233; b=OU0UG5eBYCkqZLkt6KnAMnjILKnfIBIaAwwn1sNDrxsIuGDSisUYUVKLbYPrjiW5j2xuZp3UVvpCZOlP0TtHEOMyCDBMtBb4Z1uFduVpTOz1gHSL6IvVv1vqwOgbl5rrtPiXshhwWJ3IQEnoRryjPG636g+PKF+bTNQx8w83Jpo=; Received: by smtp48.i.mail.ru with esmtpa (envelope-from ) id 1m0OQ2-0007bG-Ni; Mon, 05 Jul 2021 16:13:51 +0300 From: Maxim Kochetkov To: buildroot@buildroot.org Date: Mon, 5 Jul 2021 16:15:53 +0300 Message-Id: <20210705131553.1517949-1-fido_max@inbox.ru> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Authentication-Results: smtp48.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB96E19CC2B9345E2B1F8975EC27617E56182A05F5380850405E1C8DE81ED30C5919762A4EC5F3FD9E7606268228A5892C58C37F169F1F4165 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE771540F9ECFC94C4BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377A06FA5CCF78F9BC8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BC657FA7FDB38626393B8DC602063C2A6F9789CCF6C18C3F8528715B7D10C86878DA827A17800CE71AE4D56B06699BBC9FA2833FD35BB23D9E625A9149C048EE1E561CDFBCA1751F618001F51B5FD3F9D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B3733B5EC72352B9FA471835C12D1D977C4224003CC836476EB9C4185024447017B076A6E789B0E975F5C1EE8F4F765FCE823D0BD2C3627263AA81AA40904B5D9CF19DD082D7633A078D18283394535A93AA81AA40904B5D98AA50765F79006375722045B3F263BBDD81D268191BDAD3D698AB9A7B718F8C4D1B931868CE1C5781A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F83C798A30B85E16B42539A7722CA490CB5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C62E2A2CC9B321AEEC3B3992C812BCC221498C94B925582C79C2B6934AE262D3EE7EAB7254005DCEDD39702B95798B1671E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0B7BFB303F1C7DB4D8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C2BE7381A0AD3DF16F63D66C3FAB036D2D16639AB7DD2A09F493510439C7F03DD8FB125EDDD057381D7E09C32AA3244C24AFE5762386857095D3A9372D040B5F39C99C45E8D137E9927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj5fH2RN9TpJka6APEXRCYpw== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB2491B71A7B2D09D27A2DBE1C8FAA912874CDD5462E9B36FB30EE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix build with gcc 11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Kochetkov , b.bilas@grinn-global.com, ps.report@gmx.net Errors-To: buildroot-bounces@busybox.net Sender: "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::max)(); | ^~~~~~~~~~~~~~ Signed-off-by: Maxim Kochetkov --- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 62 +++++++++++++++++++ 1 file changed, 62 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..789983a81e --- /dev/null +++ b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch @@ -0,0 +1,62 @@ +From e4b1895bc8d02060d41a203f8503402f7a396de5 Mon Sep 17 00:00:00 2001 +From: Ville Voutilainen +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 +Reviewed-by: Thiago Macieira +[Retrieved (and backported) from: +https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] +Signed-off-by: Maxim Kochetkov +Tested-by: Peter Seiderer +--- + 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 + ++#include ++ + 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(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 +