From patchwork Tue May 20 02:58:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42761 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 ADD3F27BC49; Tue, 20 May 2025 03:59:48 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 B7CBE27BC4E for ; Tue, 20 May 2025 03:59:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHDC9-0006Dt-9G; Mon, 19 May 2025 22:59:09 -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 1uHDC4-0006C3-7s for guix-patches@gnu.org; Mon, 19 May 2025 22:59:04 -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 1uHDC3-0005t5-TU for guix-patches@gnu.org; Mon, 19 May 2025 22:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xDtUNxLHWt/JnnSn/nqr6EPx3Y8T3FsVUBk8e4QZWRo=; b=okHWKeeq8GB+y+UYLqXbA813KJJU/EAXbhU5JfkucXJUY/S9e8SlDkQaSrzTS5pXGCF5Ibn70frxsrm/sgiNfM7mZ6xTfEWQduaaKPhWtqPaIhpgj4RcR/8fn+YJCzaz9PlIyz9r5C2FxA+vAr2OkTed7VR/EJiP9tJn3iX7NfNOdmz4z7XSAPBEE5kFxgeFumxO6Eyq2DjInqg0wlkje3V1yeCkyuQFrUBa4ovIk9/VSN1+VVs03zzFlesK81RJiyyDgXpaJsb+2Pc073LE7DsZoaiXDueec10B3sbwLtOuwA3QgUlkmyTdefHse7WP8RMwRy7phE9H+YRpK6v6gw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHDC3-0000Ua-Ov; Mon, 19 May 2025 22:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78337] [PATCH v2 4/6] gnu: cups-minimal: Ungraft. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: z572@z572.online, guix-patches@gnu.org Resent-Date: Tue, 20 May 2025 02:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78337@debbugs.gnu.org Cc: Zheng Junjie , Maxim Cournoyer , Zheng Junjie X-Debbugs-Original-Xcc: Zheng Junjie Received: via spool by 78337-submit@debbugs.gnu.org id=B78337.17477099391836 (code B ref 78337); Tue, 20 May 2025 02:59:03 +0000 Received: (at 78337) by debbugs.gnu.org; 20 May 2025 02:58:59 +0000 Received: from localhost ([127.0.0.1]:50174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHDBz-0000TX-9w for submit@debbugs.gnu.org; Mon, 19 May 2025 22:58:59 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:48626) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uHDBq-0000Ru-Cb for 78337@debbugs.gnu.org; Mon, 19 May 2025 22:58:50 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-b26ef4791a5so3690434a12.1 for <78337@debbugs.gnu.org>; Mon, 19 May 2025 19:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747709923; x=1748314723; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xDtUNxLHWt/JnnSn/nqr6EPx3Y8T3FsVUBk8e4QZWRo=; b=cliQfSH1QEG74jOPGBOxb19YuCVkP+i5qn/I9yCxoCzVQWn8lEfU3lzSq353ENGeUA nifSCwvvKDN/CjSvCcNd0h/m3e1fOCI/spS3a1Ovu0K0fYjR+8RaQ7eru20p7Sv9XUUL laPMb+1YNSmJKXgWsGygGwttkex2XmKK47pyneTzm9IvF2Rm8e+dvRr60CQH8ek9onz+ vTDZ4rZ71UPIInwxq4JCt+c1sAUs89qNQIDUv7Bbd4u2MYP7VRKL860PM41SibvRXzZk LlELBm6uZ7qqmixd0gJiK/HhzMW7wh7AqWRq+wNeDbEhUFmOwbrLIgrSykqN308yDhQU 667g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747709923; x=1748314723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xDtUNxLHWt/JnnSn/nqr6EPx3Y8T3FsVUBk8e4QZWRo=; b=uSPvodMNchnwqU22eP3mJOJdte0Zt1gKgoN+l+Ft5+jzfG0B5vl70LCtQr66xrLY63 GT2TceYNfrW+r7HFuh2QisspRkSi4kkPVJGJlQ5MpNpCYY1UnN5vC11ZCQb87fUoGd9W NWCCnve0x+0BaPTsHoaH4SuW3yzmAwoRY6b//50iHFKE6pZ4JVIgbSnh9nPEvBwDGrrY 9u6qgpeB09YVLuFTASacT0JbLYB7jfago2uhqI0RgSgeZWu9u5u/5gyAVUaE6LnSO1/H 9Pc4INdspVLoGT2oO1yBb35UaemWuFwBsENb3j0k+sovjG81ApcCpOILfDARgqnwUg7n 7auQ== X-Gm-Message-State: AOJu0YxgRIvDFOT6XID8M1psOOj/+phmfMsydffY6lXmGFoOLrhjJuXf Gf0AXcjbKzjdpGmF7Jl0Y/id1+nlA1JLegWj73fUl4OjH2aIp+XbnDwFQWoFGg== X-Gm-Gg: ASbGncuDaNZEEqSAEZ4XXD2MjgTZC/OaaO11Y/gTUYWR+BZn4K78LuXVzijQ6ZrP3U9 6FeQ1XRqEIOpBdUmt264U73fzb52+seM6f7KfZQMiDrBp+lQjFuBpKTD4LvLVteZZ3C9cOej44/ N8gKqPWdjFtT7CddDs1pqSiM/LtrpS75zhF+83+7tHDr7RXPxtyCgB2RSH+zS5dGJGFMx4j6boI v31m/bN8GvKAbeF9Wn5yW1T/guo+C5QNWwEaJJFGjV8IhX5uaNLNFrv1IBFY4ifY0lx1TB+Vf4h yMTsUulPgHU58QKD5lX5mwZDtoSmYOqx4cWuyM1p6syzPwLAAKteDL1VJJAp1CBbRePE2436y5U eJi/RBQ== X-Google-Smtp-Source: AGHT+IE0b8x1sHma4vuVPZVnOaRJxtjyZ9YBIgFpIq30PTpM0elkIQmi2AzdoUttExWkqox5k2G2sA== X-Received: by 2002:a17:90b:3b46:b0:30a:204e:3271 with SMTP id 98e67ed59e1d1-30e7d5564e7mr28200588a91.17.1747709923308; Mon, 19 May 2025 19:58:43 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30f365d460fsm480078a91.23.2025.05.19.19.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 19:58:42 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 20 May 2025 11:58:14 +0900 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <62f70621a69a09b7195dca52741ed454bec9b3d7.1747709896.git.maxim.cournoyer@gmail.com> References: <62f70621a69a09b7195dca52741ed454bec9b3d7.1747709896.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Zheng Junjie * gnu/packages/cups.scm (cups-minimal)[replacement]: Remove it. [source]: Add cups-minimal-Address-PPD-injection-issues.patch. * gnu/packages/cups.scm (cups-minimal/fixed): Remove it. Change-Id: Icb5295af42b5a84741a73ed4b662bc8736ab6b2b Signed-off-by: Maxim Cournoyer --- gnu/packages/cups.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 41c3f0af45..847fc29a9a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -265,7 +265,6 @@ (define-public cups-minimal (package (name "cups-minimal") (version "2.4.9") - (replacement cups-minimal/fixed) (source (origin (method git-fetch) @@ -275,7 +274,8 @@ (define-public cups-minimal ;; Avoid NAME confusion: these are the complete CUPS sources. (file-name (git-file-name "cups" version)) (sha256 - (base32 "08wjd1flyaslhnwvxl39403qi3g675rk532ysiyk6cda4r8ks1g1")))) + (base32 "08wjd1flyaslhnwvxl39403qi3g675rk532ysiyk6cda4r8ks1g1")) + (patches (search-patches "cups-minimal-Address-PPD-injection-issues.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -355,15 +355,6 @@ (define-public cups-minimal ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file. (license license:asl2.0))) -(define cups-minimal/fixed - (package - (inherit cups-minimal) - (source - (origin - (inherit (package-source cups-minimal)) - (patches - (search-patches "cups-minimal-Address-PPD-injection-issues.patch")))))) - (define-public cups (package/inherit cups-minimal (name "cups")