From patchwork Sat Apr 5 21:44:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41328 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 37F3A27BBEA; Sat, 5 Apr 2025 23:26:27 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,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=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 AE7E927BBE2 for ; Sat, 5 Apr 2025 23:26:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1Bxk-0002OA-6R; Sat, 05 Apr 2025 18:26:04 -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 1u1Bxi-0002Nb-Tu for guix-patches@gnu.org; Sat, 05 Apr 2025 18:26:02 -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 1u1Bxi-0000Mr-Bq for guix-patches@gnu.org; Sat, 05 Apr 2025 18:26:02 -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:Date:From:References:In-Reply-To:To:Subject; bh=DjHsnp94YYCl4RvefsIF6fCiMIa1eP/1SOenJYdNcus=; b=ZvVuGxUD1IlopqwLhiB9y2N8gMw+or4eMfQZboyYPZWYrPS1QxiZXvLCCM3NHvCfNwzFV76b29X5x6WXg0uugSms3NYKTKsvxBHczWFyknE8HNAlzhxv8t4txjGRbPLujp3E5mKkBH8MGnrWms8rT4dcHv8O2masHd+PrRjeYGOs6t+ItHnOw8w6e1Q3pUNEc+JoPKhGeU0Tb7Y/AFIFZj0WNDyZ6elv3A9PeTkyuEp8GVklxDPEdBW+FTyYHFKIoySYUr1l8boqUCEMU5MCpC9k2U3DBNrkDw2jZhlF6DxbJ9EK8Oa5CR/ExPaPYPCErYhFQSnI87OfF7w6qg9NIw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1Bxi-0008D1-77 for guix-patches@gnu.org; Sat, 05 Apr 2025 18:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77564] [PATCH 1/2] gnu: Make GIMP 3 the new gimp. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Apr 2025 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77564@debbugs.gnu.org Received: via spool by 77564-submit@debbugs.gnu.org id=B77564.174389192731489 (code B ref 77564); Sat, 05 Apr 2025 22:26:02 +0000 Received: (at 77564) by debbugs.gnu.org; 5 Apr 2025 22:25:27 +0000 Received: from localhost ([127.0.0.1]:45204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1Bx9-0008Bo-8R for submit@debbugs.gnu.org; Sat, 05 Apr 2025 18:25:27 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52507) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u1Bx6-0008BN-5B for 77564@debbugs.gnu.org; Sat, 05 Apr 2025 18:25:25 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso29286975e9.1 for <77564@debbugs.gnu.org>; Sat, 05 Apr 2025 15:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743891918; x=1744496718; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=DjHsnp94YYCl4RvefsIF6fCiMIa1eP/1SOenJYdNcus=; b=M4aaA5TXICYHHkvvczV042mz+f/N8DwFMEdwgDj5kL+hjTENsiry2HVg4Ercy2DYA4 FADWzz2NnDNZuXZizrnSXxm5dq4oNqGWaPm9wuWRXWLPdXbEYgnMO8fZpiPgmCRYPlIb VWnoxfGfLPC0h5aSotx0g4WneHsdLWp9tjdSkOcNKIj60ParKzdJBqDY+nOvkw/It4DF Co4YwhZmT/qEjGdJgqK0H4dDMPU3hat4pZMjjafabEkuxnYR4Wo66bNd4ywEluIKzqew +7eoTw9yHXf+hD7v+676fOacQVHxlSsB/zen9Nb0QOuT86Df7rRTbXRRnf64rZD4FURV ckAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743891918; x=1744496718; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DjHsnp94YYCl4RvefsIF6fCiMIa1eP/1SOenJYdNcus=; b=cGT1dcA1Km4KUYvHafGBHgPksTeKbf9uXhavVzexgBM3CoHIs0zVd/Aq1rf4VyVwoI ThOxSSb1/xB6S3awI0nE4g2oFAYql+0KM076Q+GZrK2qPVTWrrQqfkS6siofLMkDjYD/ aPb6wauDXpeHbNiaRuFeExg990/IebT/zY5e5sC72jIUs1dlRl79N/jU0vJXMYOk8AMu TH8At7Rx6bLbQhuMOtL/BCVaRnyXkNEbg0z/fnZ20QuO2oO9NS5Gq/PgzKShAEeMdqd+ QDs33wZ19oTk1rrt9dks4pkedRXwAtDnv1747s2HgzwLpCSDb9NpIvIGkcs2ctvXxj+j pnpQ== X-Gm-Message-State: AOJu0YwCD2zKgDYsy1ATujpMCd7UmL7ANyO+WQg0Z2ePZnOMAu86Iajq eTzlfl9oIhZxzoFoDbq3mpeYG+YLyO5+KyOeTPkiK6eBkhySHEpakfs5l9+I X-Gm-Gg: ASbGncttWH/94zObDLnSXZ4WQF46j3uK9h73AIT+CJXdjI6eTUv4VNEDhq/hprFAyiX wH7Zh9PqupahZIxFmFyOcRbDUY3NtEbs0j2cea3Ku0ukJnP+/FRCmSOHvpsbLzXkDFbQhC//WIw a1gxTX/XeqGVPO++QEJTTOsIYRR1/BT96QF6c33Nt/z8y5hTe6N9+u/eWC7Kw5//Ik0aKRuvTW1 C3VB1v/UniFsOAYi2U1J0VLp/tboB5eCtWuDpw3TT8omFFHvCjq3ptctC/8rCIQpp44B/t+GZoV SQgVbrGvZ+Qt7vf4BPtYC9ZHqsudqUJ8ZV5P7nGnQhSLoYm2bV1votJlXg1J+H2En6IIuzVYhQf cO7qe1kgZCei0XkBzMnRa X-Google-Smtp-Source: AGHT+IF2pJI3zIWDwGo68WciFOt+wvLFKrd3gOjKCspSwcsjwn6wYvbBPvxWTIUKftsjEcpzX98+/g== X-Received: by 2002:a05:600c:1389:b0:43c:fa52:7d2d with SMTP id 5b1f17b1804b1-43ecf9c77c7mr57998515e9.20.1743891917491; Sat, 05 Apr 2025 15:25:17 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a727bsm7875085f8f.27.2025.04.05.15.25.16 for <77564@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 15:25:17 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 5 Apr 2025 23:44:58 +0200 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/gimp.scm (gimp-2, gimp-3): New variables. (gimp): Move old definition to gimp-2, point to gimp-3. (gimp-next): Deprecate in favor of gimp-3. --- gnu/packages/gimp.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 6e4916600f..ef03992f2d 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -335,7 +335,7 @@ (define-public gegl-0.4.44 (modify-inputs (package-propagated-inputs gegl) (replace "babl" babl-0.1.96))))) -(define-public gimp +(define-public gimp-2 (package (name "gimp") (version "2.10.38") @@ -421,10 +421,10 @@ (define-public gimp that is extensible via a plugin system.") (license license:gpl3+))) ; some files are lgplv3 -(define-public gimp-next +(define-public gimp-3 (package - (inherit gimp) - (name "gimp-next") + (inherit gimp-2) + (name "gimp") (version "3.0.0") (source (origin @@ -455,16 +455,20 @@ (define-public gimp-next (mkdir-p (string-append #$output:doc "/share")) (rename-file (string-append #$output "/share/doc") (string-append #$output:doc "/share/doc"))))))) - (inputs (modify-inputs (package-inputs gimp) + (inputs (modify-inputs (package-inputs gimp-2) (replace "gtk+" gtk+) (prepend libxmu libxt) (prepend python python-pygobject gjs) (prepend libxslt))) - (native-inputs (modify-inputs (package-native-inputs gimp) + (native-inputs (modify-inputs (package-native-inputs gimp-2) (prepend appstream-glib gi-docgen libarchive))))) +(define-public gimp gimp-3) +(define-public gimp-next + (deprecated-package "gimp-next" gimp-3)) + (define-public gimp-fourier (package (name "gimp-fourier")