From patchwork Thu Jul 28 20:25:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 41044 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 DF7B027BBEA; Thu, 28 Jul 2022 21:27:12 +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 98D1A27BBE9 for ; Thu, 28 Jul 2022 21:27:12 +0100 (BST) Received: from localhost ([::1]:46724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHA6B-00064e-PC for patchwork@mira.cbaines.net; Thu, 28 Jul 2022 16:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHA55-0005U3-5O for guix-patches@gnu.org; Thu, 28 Jul 2022 16:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHA54-0002e5-SL for guix-patches@gnu.org; Thu, 28 Jul 2022 16:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oHA54-0000yg-JE for guix-patches@gnu.org; Thu, 28 Jul 2022 16:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56817] [PATCH core-updates 2/3] gnu: doxygen: Fix build with GCC-12. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jul 2022 20:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56817 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56817@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56817-submit@debbugs.gnu.org id=B56817.16590399523725 (code B ref 56817); Thu, 28 Jul 2022 20:26:02 +0000 Received: (at 56817) by debbugs.gnu.org; 28 Jul 2022 20:25:52 +0000 Received: from localhost ([127.0.0.1]:59480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHA4t-0000xw-MH for submit@debbugs.gnu.org; Thu, 28 Jul 2022 16:25:51 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:36464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHA4r-0000xP-Fs for 56817@debbugs.gnu.org; Thu, 28 Jul 2022 16:25:50 -0400 Received: by mail-qv1-f53.google.com with SMTP id y11so2254740qvn.3 for <56817@debbugs.gnu.org>; Thu, 28 Jul 2022 13:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cwdiGiBNTtzdTL1cE8WfRuO2TSDDBFmN8zScLDthLC8=; b=JSvghfWVn4vTspi1AL42kqLleePpnR2Jfa+1+7OH7OpkKpgs63WMmU/78PCxkVoUp3 kFT+Ol9Qg5+kSXWbfr//tGdjNvSoJ7RxJk6gIBI7dOlzSGvivllLNbgw+s/+Vrw6/3XP YN6f4dlYNs+4jQTIPV0IiAoYVYCbX0nsUv4/HsUQS1QMMxFcF7OX2GCcPeIq8S6oCWq4 SRinMaoi5D/C89KJsnTTg/VXnODwT0nLuZg6yZ2MTgS9DzlMzIx3zsM0SXB3BO/7uuJG sys7ay/EkxD16+nAe9hlEqNOQ91qf9scuEAhJCPxLUUbZVM2gYvsL+p6pgCCMr+uG9KL FPaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cwdiGiBNTtzdTL1cE8WfRuO2TSDDBFmN8zScLDthLC8=; b=4SVvbJueegpa3OjRhiTBkBkBOAsiv3nxYbH/GgJ+lMKBPmtmiDSEzyNu+tdxlEPvfZ Edaw+1yPoyZK4TL1q5jj86QUovTH1xk58BOEJVlmbrX7tMGkpxu0kLf2dgHudzN2lI2L glvZ2MNiiSE/MpYD6f7RvggR1QLD7VI7VJy5lT7ZpdV0Mvw66XfEx1YVVphigOWzD7E2 6wAnXpLj56i0gNF7hVhArp0KhghkGPbNOxtVHQlmdmRkbs/wCji0w2ymcVAZlb81UabW upeWZNH6xnR5lfFbtV2trHsicwHtRMPZx8Cp2L6Cu2/hR5tK6RyqHNAqxNJ/4k354/Rf uoWw== X-Gm-Message-State: ACgBeo3qKP62m7c5vJpGv1bQAdszmFlxnlhbW+CLIlnV704Z2ikfnY63 TMWxSjsxI9Aebhif9DaFdWi2s5Usy4d1oPTs X-Google-Smtp-Source: AA6agR7IojazXc3DEvg0uKTPF2Gdnw4BLSaGf43EmZVlSODmFfS7MIKuh4Qul+rF43m6qZ3VsD1Sgg== X-Received: by 2002:a05:6214:d03:b0:473:7764:2ab with SMTP id 3-20020a0562140d0300b00473776402abmr612886qvh.119.1659039942791; Thu, 28 Jul 2022 13:25:42 -0700 (PDT) Received: from ip-10-114-89-198.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id e10-20020ac84b4a000000b0031ed590433bsm974925qts.78.2022.07.28.13.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 13:25:42 -0700 (PDT) From: Greg Hogan Date: Thu, 28 Jul 2022 20:25:28 +0000 Message-Id: X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/doxygen-support-gcc-12.patch: New file. * gnu/local.mk: Add it. * gnu/packages/documentation.scm (doxygen)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/documentation.scm | 4 +++- gnu/packages/patches/doxygen-support-gcc-12.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/doxygen-support-gcc-12.patch diff --git a/gnu/local.mk b/gnu/local.mk index a3f9a81440..a0ba7e4adb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1004,6 +1004,7 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ + %D%/packages/patches/doxygen-support-gcc-12.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index f71461f572..189deb9638 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -198,7 +198,9 @@ (define-public doxygen ".src.tar.gz"))) (sha256 (base32 - "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1")))) + "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1")) + ;; Remove with next release. + (patches (search-patches "doxygen-support-gcc-12.patch")))) (build-system cmake-build-system) (native-inputs (list bison diff --git a/gnu/packages/patches/doxygen-support-gcc-12.patch b/gnu/packages/patches/doxygen-support-gcc-12.patch new file mode 100644 index 0000000000..01f5040dde --- /dev/null +++ b/gnu/packages/patches/doxygen-support-gcc-12.patch @@ -0,0 +1,15 @@ +Fix for https://github.com/doxygen/doxygen/issues/9312 made in unreleased upstream commit +https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa + +diff --git a/src/cache.h b/src/cache.h +index 0ff3092ed5..e218eb27d2 100644 +--- a/src/cache.h ++++ b/src/cache.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + /*! Fixed size cache for value type V using keys of type K.