From patchwork Wed Feb 8 07:09:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 46736 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 83DE016D07; Wed, 8 Feb 2023 07:10:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 C3C9716D04 for ; Wed, 8 Feb 2023 07:10:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPeai-0004S0-Ts; Wed, 08 Feb 2023 02:10:04 -0500 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 1pPeag-0004Rf-NT for guix-patches@gnu.org; Wed, 08 Feb 2023 02:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPeag-0002t3-Dk for guix-patches@gnu.org; Wed, 08 Feb 2023 02:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPeag-0004u8-9K for guix-patches@gnu.org; Wed, 08 Feb 2023 02:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61360] [PATCH] gnu: gimp: Don't retain reference on GCC. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Feb 2023 07:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61360 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61360@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167584017018789 (code B ref -1); Wed, 08 Feb 2023 07:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2023 07:09:30 +0000 Received: from localhost ([127.0.0.1]:54564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPeaA-0004sz-2t for submit@debbugs.gnu.org; Wed, 08 Feb 2023 02:09:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPea7-0004sf-5N for submit@debbugs.gnu.org; Wed, 08 Feb 2023 02:09:28 -0500 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 1pPea2-0004Mt-Ea for guix-patches@gnu.org; Wed, 08 Feb 2023 02:09:22 -0500 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 1pPeZz-0002o5-QO for guix-patches@gnu.org; Wed, 08 Feb 2023 02:09:21 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id E0FA938A04F4; Wed, 8 Feb 2023 07:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1675840156; bh=B+R7RIYhthQZEU9IBNtOtqSlLPGv90/7IjUeSaEDQWM=; h=From:To:Cc:Subject:Date:From; b=YHBkBR9BKGiBEjGBu5AavM2SjYzMcv0MK0DCPqluEhDuyx9roLQuT1e5KePvwYyC1 vVZrX5ojfDM8/TwWNTOBNQZLQ4bIM6T+4xC8ZiL12pU7b/jWbaqwfklToT5rLZaGL5 2i6Tyba/t+nDTqlxroQ7IwvSyREOmDjeRme41ztztgY3WrUWsI1UY/vgy+iPqMR7qc KRYimTxfoYlRKzbDTMzrDHbYDA1L2A6drqsfG7PZ3cFzsxXJXszt6acZLzq8XWtGVx mRYwtuIDKgagcNdp/IJACVZOGLkLij8F/SnUIZn/3yFaRdrVvg5Z+3JpfCcCE9KjZv szpjxsWkbNG3Gvuzpvo8vGzIXgwmRfZvoZezZEapZiA9YTu4hrNcGd/jNJJupAT9AN gxfoPq4S1V2ZBMYPvmIGuL/QzUdPBt5oAhLcbU7+OkESLutvls5H2dflJMD0B3feHp pyZZw6gQX1fOZYsk6rpwZmNOGisASRrcV+0iC51xyhp1fOcThwBuAxIWmie+WjioJ2 MAjfh0DBya/0mfws3uxHRIF0gKd+ZpFejrURqtw+Hks9Hmi1+GUYboccl5bROWJ5jd 1h8Okeg3VkTpeLvZcxD7NRhr67gMK+V2Z3WnyxKpU6AhtO1WlQ/HrDalrqqekLrIbw T7iL8kO1pjsvEIbyiZ2kCsXU= 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 F9RFveDRefox; Wed, 8 Feb 2023 07:09:13 +0000 (UTC) Received: from localhost (unknown [182.150.116.135]) (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; Wed, 8 Feb 2023 07:09:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c82f5af6; Wed, 8 Feb 2023 07:09:32 +0000 (UTC) Date: Wed, 8 Feb 2023 15:09:30 +0800 Message-Id: <20230208070930.28577-1-iyzsong@envs.net> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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=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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 Partly fixes . * gnu/packages/gimp.scm (gimp)[arguments]: Add #:modules and #:phases. --- gnu/packages/gimp.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index beb43f0ae2..69281f98e9 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -302,6 +302,19 @@ (define-public gimp "doc")) ; 9 MiB of gtk-doc HTML (arguments (list + #:modules `((ice-9 popen) + (ice-9 rdelim) + ,@%gnu-build-system-modules) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-gcc-reference + ;; Avoid reference to GCC. + (lambda _ + (let* ((port (open-input-pipe "gcc -v 2>&1 | tail -n 1")) + (cc-version (read-line port))) + (close-pipe port) + (substitute* "app/gimp-version.c" + (("CC_VERSION") (string-append "\"" cc-version "\""))))))) #:configure-flags #~(list (string-append "--with-html-dir=" #$output "/share/gtk-doc/html")