From patchwork Sun Oct 2 14:22:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 43113 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5499C27BBEA; Sun, 2 Oct 2022 15:23:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1C9D027BBE9 for ; Sun, 2 Oct 2022 15:23:33 +0100 (BST) Received: from localhost ([::1]:43356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oezsS-0008O8-7i for patchwork@mira.cbaines.net; Sun, 02 Oct 2022 10:23:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oezs0-0008NR-Bn for guix-patches@gnu.org; Sun, 02 Oct 2022 10:23:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oezrz-0005Pr-3r for guix-patches@gnu.org; Sun, 02 Oct 2022 10:23:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oezry-0001i9-J2 for guix-patches@gnu.org; Sun, 02 Oct 2022 10:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58249] [PATCH] gnu: packages: qt: Fix qtbase-5 not building on gcc 11 or later Resent-From: =?utf-8?b?TcOhamEgVG9tw6HFoWVr?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Oct 2022 14:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58249@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16647205686540 (code B ref -1); Sun, 02 Oct 2022 14:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Oct 2022 14:22:48 +0000 Received: from localhost ([127.0.0.1]:47742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oezrj-0001hQ-Iu for submit@debbugs.gnu.org; Sun, 02 Oct 2022 10:22:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:33004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oezrh-0001hI-6b for submit@debbugs.gnu.org; Sun, 02 Oct 2022 10:22:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oezrg-0008J8-VU for guix-patches@gnu.org; Sun, 02 Oct 2022 10:22:44 -0400 Received: from knopi.disroot.org ([178.21.23.139]:43882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oezre-0005P9-PV for guix-patches@gnu.org; Sun, 02 Oct 2022 10:22:44 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 15F884BAB5 for ; Sun, 2 Oct 2022 16:22:39 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j9YhgCUinAPV for ; Sun, 2 Oct 2022 16:22:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664720557; bh=BwQ9/jamAUpfy4HZznwRg/g+uStIBtt96B0z4KRepfU=; h=From:To:Subject:Date; b=i8JAql5NYh57KcK+yAg2BHJ13knDIg1b5B5dnN32ErJ3Xah581ev3+ge/it0pJ4OF XJs5EDACpwJnJGxHTb+Ay1yMT/ToI9h5S+EgYDYtHQK/7m42QhAkKKRu6HpjThApdT JRCNscC6WroHXqXRWugfkus5jc9p23UC17DIMoZEyvRlwp0kiQ7RugE4+rLgksIijf qAtYs/7ww01Kzk5giipl7pSgdlhkqr5rvbIedkKjqsjjNXVHopwoQDu4BNe3yrzFz4 xx4snrjWHzj+TusmuaFQzECT6f7PsWeBatJPdw2xDTpIHtsSvsbVk96mdGmgAV+n+g blhE1VnXOMPWA== Date: Sun, 02 Oct 2022 16:22:33 +0200 Message-ID: <87fsg671au.fsf@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=maya.tomasek@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: =?utf-8?b?TcOhamEgVG9tw6HFoWVr?= X-ACL-Warn: , =?utf-8?q?M=C3=A1ja_Tom=C3=A1=C5=A1ek_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: "ashish.is--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches This fixes a bug that makes qtbase-5 unbuildable with gcc 11 and later The QT issue https://bugreports.qt.io/browse/QTBUG-91909 This patch is based on conversation from https://github.com/RPCS3/rpcs3/issues/10349 From d7467ebe3169d45a5f9500e2c8a4a992cb108f20 Mon Sep 17 00:00:00 2001 From: Maya Tomasek Date: Sun, 2 Oct 2022 16:12:57 +0200 Subject: [PATCH 1/1] gnu: packages: qt: Fix qtbase-5 not building on gcc >= 11 --- .../patches/qtbase-remove-template.patch | 18 ++++++++++++++++++ gnu/packages/qt.scm | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qtbase-remove-template.patch diff --git a/gnu/packages/patches/qtbase-remove-template.patch b/gnu/packages/patches/qtbase-remove-template.patch new file mode 100644 index 0000000000..5686ebf4db --- /dev/null +++ b/gnu/packages/patches/qtbase-remove-template.patch @@ -0,0 +1,18 @@ +Remove template from ThreadEngineStarter, this causes gcc >= 11 to emit error, +and not compile the header. See https://bugreports.qt.io/browse/QTBUG-91909 + +Based on a conversation from https://github.com/RPCS3/rpcs3/issues/10349 +=============================================================== +--- a/src/concurrent/qtconcurrentthreadengine.h ++++ b/src/concurrent/qtconcurrentthreadengine.h +@@ -247,7 +247,7 @@ template <> + class ThreadEngineStarter : public ThreadEngineStarterBase + { + public: +- ThreadEngineStarter(ThreadEngine *_threadEngine) ++ ThreadEngineStarter(ThreadEngine *_threadEngine) + :ThreadEngineStarterBase(_threadEngine) {} + + void startBlocking() +-- +2.37.3 \ No newline at end of file diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6e30980505..6d29b6fd09 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -294,7 +294,9 @@ (define-public qtbase-5 ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" "qtbase-moc-ignore-gcc-macro.patch" - "qtbase-absolute-runpath.patch")) + "qtbase-absolute-runpath.patch" + ;; fix qtbase-5 not building on gcc >= 11 + "qtbase-remove-template.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 -- 2.37.3