From patchwork Fri Mar 31 18:54:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49074 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 1BC0817491; Tue, 11 Apr 2023 08:11:53 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 4D299172BD for ; Tue, 11 Apr 2023 08:11:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89i-0004CD-8P; Tue, 11 Apr 2023 03:11:06 -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 1pm89g-0004A8-8o for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm89f-0000vC-Vc for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89f-0008IR-RV for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 13/15] gnu: inkscape: Update stable version to 1.2.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 07:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168119702531741 (code B ref 62467); Tue, 11 Apr 2023 07:11:03 +0000 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:25 +0000 Received: from localhost ([127.0.0.1]:36461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm892-0008Fr-IN for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:24 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:36795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88v-0008Dj-85 for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:17 -0400 Received: by mail-ej1-f67.google.com with SMTP id q23so8376366ejz.3 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=bMp0hGD30e+De/eIfLFVgBoFutG5Sw9z2avv80IxHSrxoetdeULwDCCzI/GS6UBYFv B3PWZqdYSDxCRXOJfTxRIizJbM61+TLW4I8s9tTcvEdM0VdIf3MvZZssc3sR+wV2lm66 nuK2up7xi4TBk7kSTDiymbjZKFuoeiqkBDv99vZahn1LG8Irug7uGJZv/M4a3qf55/pr eN0Ao0UDgo7s+c5ERF/WKLwEHSvF3O3W1BrF1rcbDHJLrZ2kxZbqE2YtLXE9Tg1TMo/d GZxa16/0FWcV5noVy8dhPWLdhiwp80e1u98guXRYckaIkjAgnaRGvYhvP1+m4rh2u4KH fbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=ws1mLhiIo0mHOfqbWvaFebCRI+qqvS1PYh6ULBjLrN/jFsyqDsuIyJ7rrS8RqliszK rX+iUcfNIdTzWLf1qEqSSfk6MRr3Bb3nQY/emwbCVpz+oWRgisLpQ0d0tXImTcKx4t/p 4p6XCMK/PrtQSR4J7bp470hgM/xUakn67UqtUFT6r+v6x+JOUU0d7w4+llNZM/LMqM6y jqocn1Ejg+uPhWQNiC9CrHac0WUjWg9rzZUBVa+edldSLqyql/w3t+iyYr5e4Syklx6M 7bgAtLPMCe1LF4+iC4I6PNsdfVsJ2jjykqJySBiIkxPnJD4BlurKUdfs90nw4XQl9Isc FFBw== X-Gm-Message-State: AAQBX9emjI9O9SZn40s4biSHoVhfu6tHplgT8M7iyC/VAHp4WPA0T0bF qbVk1G/ogUrnUlt64Kix4EWvZPI280SBcA== X-Google-Smtp-Source: AKy350ZhWrKICD6JWwIvpVVW77P/yDWC/PSvaTShjbSHU1y/SqYfeqTqxyA5+5LPn8hG8KuWb6IDsg== X-Received: by 2002:a17:907:7f0e:b0:93f:f70:b2e6 with SMTP id qf14-20020a1709077f0e00b0093f0f70b2e6mr1830411ejc.0.1681197016865; Tue, 11 Apr 2023 00:10:16 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:16 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 31 Mar 2023 20:54:00 +0200 Message-ID: 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/inkscape.scm (inkscape/stable): Update to 1.2.1. [inputs]: Add bash-minimal, librsvg and python-cssselect. Use lib2geom-1.2 rather than lib2geom. (inkscape): Inherit build-system, arguments and inputs. --- gnu/packages/inkscape.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index d1ac5e7312..b8e78c2b11 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -61,7 +61,7 @@ (define-public inkscape/stable (hidden-package (package (name "inkscape") - (version "1.1.1") + (version "1.2.1") (source (origin (method url-fetch) @@ -69,7 +69,7 @@ (define-public inkscape/stable "resources/file/" "inkscape-" version ".tar.xz")) (sha256 - (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf")) + (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")) (modules '((guix build utils) (ice-9 format))) (snippet @@ -196,9 +196,14 @@ (define-public inkscape/stable (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/inkscape") `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH")))))))))) + (,(getenv "GUIX_PYTHONPATH"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load + ;; its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs `(("aspell" ,aspell) + ("bash-minimal" ,bash-minimal) ("autotrace" ,autotrace) ("gdl" ,gdl-minimal) ("gtkmm" ,gtkmm-3) @@ -206,12 +211,13 @@ (define-public inkscape/stable ("gtkspell3" ,gtkspell3) ("gsl" ,gsl) ("poppler" ,poppler) - ("lib2geom" ,lib2geom) + ("lib2geom" ,lib2geom-1.2) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libgc" ,libgc) + ("librsvg" ,librsvg) ; for the pixbuf loader ("libsoup" ,libsoup-minimal-2) ("libcdr" ,libcdr) ("libvisio" ,libvisio) @@ -223,6 +229,7 @@ (define-public inkscape/stable ("lcms" ,lcms) ("boost" ,boost) ("python" ,python-wrapper) + ("python-cssselect" ,python-cssselect) ; to render qrcode ("python-scour" ,python-scour) ("python-pyserial" ,python-pyserial) ("python-numpy" ,python-numpy) @@ -255,25 +262,4 @@ (define-public inkscape "inkscape-" version ".tar.xz")) (sha256 (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) - (build-system cmake-build-system) - (arguments - (substitute-keyword-arguments (package-arguments inkscape/stable) - ((#:phases phases) - `(modify-phases ,phases - (replace 'wrap-program - ;; Ensure Python is available at runtime. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" prefix - (,(getenv "GUIX_PYTHONPATH"))) - ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load - ;; its own icons in pure environments. - `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))) - (inputs (modify-inputs (package-inputs inkscape/stable) - (replace "lib2geom" lib2geom-1.2) - (append bash-minimal - librsvg ;for the pixbuf loader - python-cssselect))) ;to render qrcode (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))