From patchwork Mon Jan 22 01:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 59307 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 7959327BBE9; Mon, 22 Jan 2024 01:21:15 +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_H5,RCVD_IN_MSPIKE_WL, 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 41F6327BBE2 for ; Mon, 22 Jan 2024 01:21:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRizj-0005JF-Mc; Sun, 21 Jan 2024 20:20:59 -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 1rRizi-0005J2-S0 for guix-patches@gnu.org; Sun, 21 Jan 2024 20:20:58 -0500 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 1rRizi-0000IB-Jz for guix-patches@gnu.org; Sun, 21 Jan 2024 20:20:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRizm-0007V1-AO for guix-patches@gnu.org; Sun, 21 Jan 2024 20:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68651] [PATCH] gnu: cgit: Fix patch-absolute-file-names phase. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 01:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68651 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68651@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170588646128823 (code B ref -1); Mon, 22 Jan 2024 01:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Jan 2024 01:21:01 +0000 Received: from localhost ([127.0.0.1]:39494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRizl-0007Ud-95 for submit@debbugs.gnu.org; Sun, 21 Jan 2024 20:21:01 -0500 Received: from lists.gnu.org ([2001:470:142::17]:34760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRizh-0007UK-Rg for submit@debbugs.gnu.org; Sun, 21 Jan 2024 20:20:59 -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 1rRizY-0005If-Cq for guix-patches@gnu.org; Sun, 21 Jan 2024 20:20:48 -0500 Received: from nomad-cl1.muradm.net ([139.162.159.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRizW-0000HA-TH for guix-patches@gnu.org; Sun, 21 Jan 2024 20:20:48 -0500 Received: from localhost ([127.0.0.1]:40830) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1rRizT-0001EC-0Q for guix-patches@gnu.org; Mon, 22 Jan 2024 01:20:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=1n7sV7oYd8ixnKClrY4EW6BQL6QZozuXQ9rXLq7tU94=; b=Al1vx4qaSGVVTOW+wsAonZDcWk q4oAP9I2QUbx/O5/x5mt9Bjyt+P8j8AW37Mj9jzYroHt2KqVdtD8RqaJ/4lZV4d7dzxcCdZ49HrRK xdvzGlHaLLSmdZ7iVQonH88JzngsUfA25Az0VsT1/9LSHaVdUI/KCkSh/gJxeTWgMFGZrHkFUVDm8 watPshpsZQvAkPL0FcwSSqPyVG9eJtI9T0HBZ49nRRlOh9Sfta6ha2kygc1stlLgvzMFHvgQDTiwC axS8spL2fMRilRvnT+xPZ8WikrQ2OMsW108K6aPQf1iHmBYIs5XyO0zzNX3tj0L+NyQEAhFQha+T+ 3jxTn+PTAACZMW+Lx+iKIULff1yLdcLfVuJ+fas8a0arI8JX8F0PlEnmTjOygDS0tqV6zz5bIHmfx kUr4cXeoum3GLky26+mchgtECDCDK/WQnpTySerbNtIC2CQqPCNcck1A85JhB9PF5AKmxy6Gctsp2 2SELAogbvwucnRmHv3C8wbci; Received: from muradm by localhost with local (Exim 4.96.1) (envelope-from ) id 1rRizS-0004z4-2J for guix-patches@gnu.org; Mon, 22 Jan 2024 04:20:42 +0300 From: muradm Date: Mon, 22 Jan 2024 04:20:42 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.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, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Change-Id: I06c624ba23bfd0b8ca45045d1d2155c53258047e --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 17e0b03824209ec2dc291d51f42d8c67e13122d6 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a7a701629f..8366335b08 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1148,7 +1148,7 @@ (define-public cgit (invoke "tar" "--strip-components=1" "-C" "git" "-xf" (assoc-ref inputs "git-source")))) (add-after 'unpack 'patch-absolute-file-names - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (define (quoted-file-name input path) (string-append "\"" input path "\"")) (substitute* "ui-snapshot.c" @@ -1160,7 +1160,7 @@ (define-public cgit (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) (substitute* "filters/about-formatting.sh" - (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") + (("\\$\\(dirname \\$0\\)") (string-append (assoc-ref outputs "out") "/lib/cgit/filters")) (("\\| tr") (string-append "| " (which "tr"))))