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: 48888 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 D6CC0170EA; Fri, 31 Mar 2023 22:50:04 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 4A0FA171B4 for ; Fri, 31 Mar 2023 22:50:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcP-0006Ew-5n; Fri, 31 Mar 2023 17:49: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 1piMcN-0006DF-D4 for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -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 1piMcN-0001Xs-5V for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcN-0001u1-2n for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 12/12] 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: Fri, 31 Mar 2023 21:49:07 +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.16802993427225 (code B ref 62467); Fri, 31 Mar 2023 21:49:07 +0000 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:02 +0000 Received: from localhost ([127.0.0.1]:34753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcH-0001sK-Hn for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:01 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbw-0001pq-QF for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:41 -0400 Received: by mail-ed1-f65.google.com with SMTP id er13so54032287edb.9 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299315; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=WCbRRSNbDbmN3lB6M2kic/yuh8xDB5YcMjP5gzNXCURmUpvOruNFNkNln9EfMUxRiC q3nTwRk7mERjFONrifoxjfaLs/mBHb2YBb5t+1GLw7Ke0TrXuUGcRQzGthdZEZrcTMXb Lirpj14gTLmbCPtrbkubMxx+XF6EQh25ulojTj1HfHQ7vYx6OOMHe3bTIAfpmhAMxU8+ vtUfwZ3fqR++6a9WHHHsb+IHamYqs2Bf8DIFun0eH2rUlivZUk5mj0EWZQH/fW+22n2k j/1Hz8n+1+UVPh8/3O+1nyJ1sdPOGGg9AvFp3ibQGGlx559DCVuAbdhNOiFW1KYO5IQZ tPsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299315; 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=qfqxK4wWuvrB5XRINYJmQgzOo3qvvh7T/aLuOTNY/zrzpm9jfohIqVO9Agv/hQ065+ zJKkjM/1W3pSM1hS0g50SG2eK2Ok6U2FphOnAVQlIXudm4zm4rE2T2GeO65KOUXdSWi2 Pvg0ZmCv0vfWMvr5shzkz7WkiLLz5SalxYEJZrHrKZ0axgZhGtqGLOlhdbrzYpGThhrN kQvBwTF/2FGLZ8gXpmpFnNTh4tckeCHVadUoKekT58EyEXd3BWz68xxy7VtPKstZyrz0 004Fuen/Vz+f+4NsX/L7ntpf+FivB3HlovA/nUZjPZP3gji17fQWu5uqKEkQDjn7aM1C KimA== X-Gm-Message-State: AAQBX9e5AWQ0sU3ezHWUdeQ9Jp0NU/bCXBKJfEC1rvPKxUvSylaUEZLz VI2ERH158kzYL8Ixs4cBNdgalojRHMtidA== X-Google-Smtp-Source: AKy350a2kx0pIZnLgBOQNchZ4kSUPzZIn1AMKJ8iAbrbV5Z0Q2d52rAGKoDlbzeOaMiboTSm0M0UqA== X-Received: by 2002:a17:906:3149:b0:8ab:b03d:a34f with SMTP id e9-20020a170906314900b008abb03da34fmr10480731eje.12.1680299315212; Fri, 31 Mar 2023 14:48:35 -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 pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:34 -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)))))