From patchwork Thu Feb 29 17:47:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 61251 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 7F97227BBEA; Thu, 29 Feb 2024 18:12:02 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 A3F2227BBE2 for ; Thu, 29 Feb 2024 18:12:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfksh-0007NY-8q; Thu, 29 Feb 2024 13:11:43 -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 1rfksa-0007GK-He for guix-patches@gnu.org; Thu, 29 Feb 2024 13:11:36 -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 1rfksa-0001ju-8Z for guix-patches@gnu.org; Thu, 29 Feb 2024 13:11:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfkt1-0006ay-EQ for guix-patches@gnu.org; Thu, 29 Feb 2024 13:12:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69477] [PATCH 6/6] gnu: Add gimp-next. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Feb 2024 18:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69477@debbugs.gnu.org Received: via spool by 69477-submit@debbugs.gnu.org id=B69477.170923030325285 (code B ref 69477); Thu, 29 Feb 2024 18:12:03 +0000 Received: (at 69477) by debbugs.gnu.org; 29 Feb 2024 18:11:43 +0000 Received: from localhost ([127.0.0.1]:35336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfksh-0006Ze-0N for submit@debbugs.gnu.org; Thu, 29 Feb 2024 13:11:43 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:55448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfksZ-0006Ye-Ig for 69477@debbugs.gnu.org; Thu, 29 Feb 2024 13:11:37 -0500 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a44665605f3so67657166b.2 for <69477@debbugs.gnu.org>; Thu, 29 Feb 2024 10:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709230202; x=1709835002; 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=Kc43CyLFlk84dpBz0/xkO9ctsRoBBKkTwWo8e6CyosE=; b=BK+kFmTSrVXVvaHybhZcZuKUys8q3cgMXE7B+WVTthdEIiW0D4Uk3mUCngqT/1Rf/c TQ/8WfhlWtZWSzndSI6Im2iK5Bbw9DIKnPIljhhHQVuEUGTMt90F5SrZMKbKhtTE/le1 I8OJ2Eo3uBINKXzEZJjsmJCNUNY5OniAL2gOvZN2pJIcT9AoIY5bAB/dolQH1HwqjM5+ ecwOBo5pExjWCuLPUNOUYG/nvbZ8SZjTPPFj7XsobdHVEoGPIUrdBtc5X2GceZrv+4VX +MubXLbjzbd2ONYxPbQffHv7utANOQsNIu15qtXEepkvaqUla7lxzOfspSuwuocltLvW XYJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709230202; x=1709835002; 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=Kc43CyLFlk84dpBz0/xkO9ctsRoBBKkTwWo8e6CyosE=; b=dhUvJPTB56Ft68fOQPrawGVCLWvIZbCqDIhVnjXtLYhbHdi0bWJezSWThEBdpkkH0v qJDLL0Ksc4Y9rqfuCXgOSghIcQ1VQ3kFnoknk6lo9KLdjyH8jgezCxiPEdtQrJPZke7l mL0ty8QpusOxBMkhjGknUzTWhlGiFkPRLB6uJcdbNFEFDSXdtrfsPKYVV/a28awOvSHd 443/wcV9BYhXPJbaNjvnMPA0B1Wdil4EnN/G7ya/IW+TveeDDJGxmwr/1bfEYLcrPT3p uMiDe+HX05aOFTTvrY1gtcIqSbpE8R+yfqq5BWRas8Ox2jOeyU/T0kRlk/xF0yQAhI77 RpUg== X-Gm-Message-State: AOJu0YyekPcxCOBFABNB9JpLgtk6LQwgQ2rcZ72ISsM48vsU0FTf/8uE Kg/YOhMGU10wLph7ocneBZb5W1I9yR6YDz4cJposs6VLpjZn+YntHbsPQktAVZk= X-Google-Smtp-Source: AGHT+IFCiSg/7lTgaPnmXoBGW295o64g3wKomxoqvu0bSbaT1/vcl72w9HJgV0r9L7OD3VE/45HAAw== X-Received: by 2002:a17:906:489b:b0:a3e:9def:5c8d with SMTP id v27-20020a170906489b00b00a3e9def5c8dmr2110480ejq.28.1709230202482; Thu, 29 Feb 2024 10:10:02 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id un8-20020a170907cb8800b00a445044287bsm656046ejc.123.2024.02.29.10.10.01 for <69477@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 10:10:02 -0800 (PST) Message-ID: <260586dc4bda46c68443a8c8db97abfc0724d3eb.1709229203.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 29 Feb 2024 18:47:12 +0100 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-next): New variable. --- gnu/packages/gimp.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ebe1e20c97..3c4353f8a0 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -38,6 +38,7 @@ (define-module (gnu packages gimp) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) @@ -367,6 +368,52 @@ (define-public gimp that is extensible via a plugin system.") (license license:gpl3+))) ; some files are lgplv3 +(define-public gimp-next + (package + (inherit gimp) + (name "gimp-next") + (version "2.99.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.gimp.org/pub/gimp/v" + (version-major+minor version) + "/gimp-" version ".tar.xz")) + (sha256 + (base32 "0vnvdl7x88njyyxkbgdbhz6jwz1qasrxh0fpwk6x1m609alvf6wc")))) + (build-system meson-build-system) + (arguments + (list #:modules `((ice-9 popen) + (ice-9 rdelim) + (guix build meson-build-system) + (guix build utils)) + #: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 "\"")))))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file (string-append out "/share/doc") + (string-append doc "/share/doc")))))))) + (inputs (modify-inputs (package-inputs gimp) + (replace "gtk+" gtk+) + (prepend libxmu libxt) + (prepend python gjs) + (prepend libxslt))) + (native-inputs (modify-inputs (package-native-inputs gimp) + (prepend appstream-glib + gi-docgen + libarchive))))) + (define-public gimp-fourier (package (name "gimp-fourier")