From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eEmGMCEG7mTTewEAG6o9tA:P1 (envelope-from ) for ; Tue, 29 Aug 2023 16:52:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eEmGMCEG7mTTewEAG6o9tA (envelope-from ) for ; Tue, 29 Aug 2023 16:52:17 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A62C73B707 for ; Tue, 29 Aug 2023 16:52:16 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=FEoO10H5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693320737; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=x7XNEeBEnJDKn6vrxifx3slo2EWNWGzCaGYJdK6dW/4=; b=MPm34EQc6E5mt8HLJU1WgtNVXxyyyNHM3hAWkvPreEdfu7JLh507pjRzgW/wFCanP1inEX actd1r7qtcQr5O2fAy4/I0hsk7bcT4beiff+O4OSL7d5SCVdT4mPoM7i8zgYmzao564k2f zJG5+h0cSUXpILUBTJtnk9xf1YT1S0+WXudDLhNgbO9IGfdmnTzf+tgVzByHZkzfIgSqqP 87BWF7GtPwhfokceLiGueSt5CZFgclE8YZOwIHUpNEYdlE1NzQrdHSPRq4jyb8ck7ylhC6 gkS4/ekH8qGkIlySl93g1rO2tPwgMTpWHyrz3ai2JugnJRftk6IK1qDnu5/Zyw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693320737; a=rsa-sha256; cv=none; b=iO3RAvreTidb10RUkD8fZwKH/i39Y3TQxHRKdjXObh/jg2BWvuzKHK8ApnCkHbic+2npJK F7LS5q4viEoAqkYejkB/uQhe/rsMRwYXq2bPJ3kl346HgkWkc6kGNOTfxNOs7cF7REQnDD 47mjUocbghfpi90tCAofwITm7/SsMbZlpSK1hfAlTfP2Q8nTlLROi7ta6zFfOKhh5E41Ux b8bkVlXpNzHhhBarlCn5qC5gZl/8gB4KpZTbUMY1Lfxdp4StsjMiIORXwgub4x+ueQ/eS4 P732Knu9uvQpj9E7rWT3EOqYhNU/EZSxWkrTY5TG7RfRNh422r1gx4Q+ricQYg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=FEoO10H5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qazMw-0002DM-Dw; Tue, 29 Aug 2023 10:06:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qazMt-0002Cf-MU for guix-patches@gnu.org; Tue, 29 Aug 2023 10:06:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qazMs-0005jI-QY for guix-patches@gnu.org; Tue, 29 Aug 2023 10:06:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qazMz-00064f-OJ for guix-patches@gnu.org; Tue, 29 Aug 2023 10:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65593] [PATCH] gnu: vtk-7: Fix build. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 14:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65593 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65593@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169331798623293 (code B ref -1); Tue, 29 Aug 2023 14:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Aug 2023 14:06:26 +0000 Received: from localhost ([127.0.0.1]:51315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qazMQ-00063d-5c for submit@debbugs.gnu.org; Tue, 29 Aug 2023 10:06:26 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qazMN-00063D-Uv for submit@debbugs.gnu.org; Tue, 29 Aug 2023 10:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qazLz-0001aT-UL for guix-patches@gnu.org; Tue, 29 Aug 2023 10:06:01 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qazLx-0004vP-BT for guix-patches@gnu.org; Tue, 29 Aug 2023 10:05:59 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 8B21C38A013C; Tue, 29 Aug 2023 14:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693317948; bh=x7XNEeBEnJDKn6vrxifx3slo2EWNWGzCaGYJdK6dW/4=; h=From:To:Cc:Subject:Date:From; b=FEoO10H5NDOA9QaqX9ztjqjJDulFdf+e6FFKneHRCO2Y0goKZSLMM76l3x8eqNReM 4rAh8Hh76yv8O2UyL9cXU7x32SbXr8GRXjZNdP0L/QN+vdsXC7d2CTE8faER3QyiVU uLgtGTTSg5toDpAp+arUkCH73yCBXivKTBm++mBFFAFNHJKFTDZjJpKsAfBRNPYC8x mgmG9t92zddliqlCB1iCVPmzSdzrwUycAVTgHWUhx5iGnbGkITnaiSew1mXxmlxqh0 FjxW1jvAXFJszPMb3EgMKMRvEryja34UeRXHvJD/Lj3GRponsH2+14iLiWoa1Gojgs IBOUdm8EFhcXN6sqCg6IJ357ZFSe5AM6Xqg1jKOwkbyNA51fRgWLF0OKX7AcDgH07j sc8nQdvRuEtiL1i+vVaatxRbUtmxk5MKc8PlqgguuIrgdq3LaiXzN+KUtUrJaQcAwd FeWnr8EUCzjs0KgawEFv7O8Uaf2xlwc1mrpZhYyXVCcHwPnCjVzerZwkIt9YvJ51Xq zn+psp9v+0VrwJkAGgbybkrm7bJzLoGtinqE7xQ+RzNQ1VN9mmAe4j2CgdzcfhvJcH UivOfK3z5I9IPUQ02hvayhrTlzkTL8bVgafoC2QlmAOpS/d9aAf8eRiRYPs+o+8TS6 GrSbgL1+8TXbaKGYbTRNL50A= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id r5H-2pgPXWGM; Tue, 29 Aug 2023 14:05:45 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 29 Aug 2023 14:05:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8dd9269b; Tue, 29 Aug 2023 14:06:08 +0000 (UTC) Date: Tue, 29 Aug 2023 22:06:02 +0800 Message-ID: <6b06ed7d65400b6ad4cf248451e8f2952bd4188f.1693317959.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net 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=unavailable 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.72 X-Spam-Score: -6.72 X-Migadu-Queue-Id: A62C73B707 X-Migadu-Scanner: mx2.migadu.com X-TUID: 7nOjyVXLBwX/ From: 宋文武 * gnu/packages/patches/vtk-7-gcc-11-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/image-processing.scm (vtk-7)[source]: Add patch for gcc-11. --- gnu/local.mk | 1 + gnu/packages/image-processing.scm | 3 ++- gnu/packages/patches/vtk-7-gcc-11-compat.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/vtk-7-gcc-11-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 48187d7e64..9b493df8d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2085,6 +2085,7 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-7-gcc-10-compat.patch \ + %D%/packages/patches/vtk-7-gcc-11-compat.patch \ %D%/packages/patches/vtk-7-hdf5-compat.patch \ %D%/packages/patches/vtk-7-python-compat.patch \ %D%/packages/patches/wacomtablet-add-missing-includes.patch \ diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index afeda4bc20..771a2d52f4 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -472,7 +472,8 @@ (define-public vtk-7 "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d")) (patches (search-patches "vtk-7-python-compat.patch" "vtk-7-hdf5-compat.patch" - "vtk-7-gcc-10-compat.patch")))) + "vtk-7-gcc-10-compat.patch" + "vtk-7-gcc-11-compat.patch")))) (arguments (substitute-keyword-arguments (package-arguments vtk) ((#:configure-flags flags) diff --git a/gnu/packages/patches/vtk-7-gcc-11-compat.patch b/gnu/packages/patches/vtk-7-gcc-11-compat.patch new file mode 100644 index 0000000000..c7ab3af36e --- /dev/null +++ b/gnu/packages/patches/vtk-7-gcc-11-compat.patch @@ -0,0 +1,11 @@ +Description: GCC 11 now enforces that comparison objects be invocable as const. +--- a/Rendering/Label/vtkLabelHierarchy.cxx ++++ b/Rendering/Label/vtkLabelHierarchy.cxx +@@ -525,1 +525,1 @@ +- const vtkHierarchyNode & b) ++ const vtkHierarchyNode & b) const +--- a/Rendering/Label/vtkLabelHierarchyPrivate.h ++++ b/Rendering/Label/vtkLabelHierarchyPrivate.h +@@ -66,1 +66,1 @@ +- bool operator () ( const vtkIdType& a, const vtkIdType& b ) ++ bool operator () ( const vtkIdType& a, const vtkIdType& b ) const base-commit: 715d203b414727be43e405d09e86aa823125a4b3 -- 2.41.0