From patchwork Fri May 9 16:50:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 42488 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 C3A6527BC49; Fri, 9 May 2025 17:52:36 +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=-5.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 3A26927BC4A for ; Fri, 9 May 2025 17:52:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDQxL-0003d0-DB; Fri, 09 May 2025 12:52:15 -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 1uDQxB-0003by-SZ for guix-patches@gnu.org; Fri, 09 May 2025 12:52:07 -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 1uDQx9-0001ls-WA for guix-patches@gnu.org; Fri, 09 May 2025 12:52:05 -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=Zuaf+aaIg1TCfQXnXxVvX5fIvWVArK3dj1y7DqBMY4k=; b=I+XHyfWnHbmDWkW/D1C3USnFJwKBPgv/9KdJKmXqLgazsFi67Dc/lTlyPr/W4d1gK3ECDaWNPT5Cm4/SLSZtTp3SJpWqh207EKkA2Mbty9DohcrqJlg6A8TDPMT//NfFKgpHJthy02TxaEF6Ffzevb4VK+sDpsRv1fLL721Pf0OlbbqTNGhkIkLk21Hh5jJoSrDKBeAuWVowO5FZ6byHO8FLtzqnmKo+32ED/wSbnQ8fw7H46bEGWgSBLqQp3lcLFpkrQ6XYrikMm1lMWHvmFV0Og0VCI5TyuzQZ8znQvsnR6lmCwz4cTxKTGlVwMVCQBY6TXSGPidIXtysKvDM8JQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDQx8-0007QF-Qj for guix-patches@gnu.org; Fri, 09 May 2025 12:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78337] [PATCH core-packages-team 2/4] gnu: cups-minimal: Ungraft. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 16:52:02 +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 Received: via spool by 78337-submit@debbugs.gnu.org id=B78337.174680947328405 (code B ref 78337); Fri, 09 May 2025 16:52:02 +0000 Received: (at 78337) by debbugs.gnu.org; 9 May 2025 16:51:13 +0000 Received: from localhost ([127.0.0.1]:38976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDQwK-0007O1-LU for submit@debbugs.gnu.org; Fri, 09 May 2025 12:51:13 -0400 Received: from mail.z572.online ([88.99.160.180]:46358) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDQwE-0007N1-NF for 78337@debbugs.gnu.org; Fri, 09 May 2025 12:51:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1746809880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zuaf+aaIg1TCfQXnXxVvX5fIvWVArK3dj1y7DqBMY4k=; b=aYEofaqOUbeUiPMsYfZhbgeRKUlS8wFV8k/UGb2/ycImzi2Sy4c1B0Id2UO8gG+8NuN+TC KuKymUeOfKPkN0643PWuNrUZR2VpBAPCrhM9TOlqanh0sOhhDivKfx7fCQG0wdUxtU9TXS EzBZIuPcV8YZScBSdFlbNHKUuRGhg1A= Received: from m.tailaa68d.ts.net ( [61.174.159.83]) by mail.z572.online (OpenSMTPD) with ESMTPSA id babfcb5b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <78337@debbugs.gnu.org>; Fri, 9 May 2025 16:58:00 +0000 (UTC) From: Zheng Junjie Date: Sat, 10 May 2025 00:50:53 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 --- 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 5eb45b97b5..2ef1a56b2f 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -266,7 +266,6 @@ (define-public cups-minimal (package (name "cups-minimal") (version "2.4.9") - (replacement cups-minimal/fixed) (source (origin (method git-fetch) @@ -276,7 +275,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 @@ -356,15 +356,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")