From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oPSZMPXFMWTdHgEASxT56A (envelope-from ) for ; Sat, 08 Apr 2023 21:52:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GDqmL/XFMWTeNQEAG6o9tA (envelope-from ) for ; Sat, 08 Apr 2023 21:52:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8148831A2E for ; Sat, 8 Apr 2023 21:52:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plEbU-0000C2-Sf; Sat, 08 Apr 2023 15:52: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 1plEbS-0000Bs-U9 for guix-patches@gnu.org; Sat, 08 Apr 2023 15:52:03 -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 1plEbS-0006H4-MV for guix-patches@gnu.org; Sat, 08 Apr 2023 15:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plEbS-0002kF-Bu for guix-patches@gnu.org; Sat, 08 Apr 2023 15:52:02 -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. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 19:52:02 +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: Liliana Marie Prikler Cc: rg@raghavgururajan.name, 62467@debbugs.gnu.org Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168098351610535 (code B ref 62467); Sat, 08 Apr 2023 19:52:02 +0000 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:51:56 +0000 Received: from localhost ([127.0.0.1]:59640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEbM-0002jr-8A for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:51:56 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:41616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEbK-0002jc-Ok for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:51:55 -0400 Received: by mail-qt1-f176.google.com with SMTP id cn12so39849063qtb.8 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680983509; x=1683575509; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=nkhZS5oe/Zj20YgVYtoy+VQjrvO2PxLEA0u8Gyii1DQ=; b=LtuZGMWvbuU7raS576WcOghGZ79jeHV6c5TSHpkQ0HADkLOsX3nDTZBKzVpvmvzeRj Ke1kbvkACbL8GFs37Dt/Hu7S95lKYXwVKpxDrJ5bKzh7UAwIoAyDHC9CQd5ZbvIgfUdK AQ02fKnz0xLInzMLOJYu/HzdVFtV/jwDW9vwSsaVpkKS/NYgQuW1nnNWgFJ+y8sWHHBv 9YqUnREv9zFDdsvRLmFyQT09Fufaonl+7uIfjEvA+CS7biX/DTBczEbsuI5745i1oWld TlVxflSw88bBzWF3lMu46Uwgij/Dhp4QgIUCE62u7kKr5JaPLSAqKoDv4J18ENjJLaB5 Ltkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680983509; x=1683575509; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nkhZS5oe/Zj20YgVYtoy+VQjrvO2PxLEA0u8Gyii1DQ=; b=3ckSLPNCmdzSx4SWV8RAYHpK4ZgWdzZUa+sPfiFlsxqPVTj0ebT7IkeGnxSe/A6Xp2 CTnlKKBP//ixFXW+JrmeZNQmtnpLKnHOaLA5XJODGhOYJGlYGU+zWs2B655xuY4YyDFT VquNyhvZVZxxrenhOcsgrpRT7LfF17OIvYJQdxNeMpEC5Apx2kIVvWLN9iSNHG+/uv2Y P+lYmn2A93OFqUVGuxZHSkRMlgT17qyMT5OvZqST3kwdf1jjE0bNtw2+s1HaiShFblWK /G3zxHfTXyrsAryU4mH9NAQzaSMxpRQ3VXZyF5WSHMY1MqmRLET+KneLpitQPhl0PvKO W0WA== X-Gm-Message-State: AAQBX9eueVIHgt/rIoA9h6B87oNhAruBoNh+8hEnfXmOqqMfGEawKu6L nAT856ahXICXlKCJMVFZ8ZM= X-Google-Smtp-Source: AKy350YJ1GxZlJiFPq/ZoxkYpRpK5nsSwi/hvE1waUzLoLJ8V0eh8ezALTA+ND7pnW2IenulR1gqow== X-Received: by 2002:a05:622a:199f:b0:3e4:3f79:9d7b with SMTP id u31-20020a05622a199f00b003e43f799d7bmr10091718qtc.55.1680983509184; Sat, 08 Apr 2023 12:51:49 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id 15-20020a05620a040f00b0073b8512d2dbsm2180941qkp.72.2023.04.08.12.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:51:48 -0700 (PDT) From: Maxim Cournoyer References: Date: Sat, 08 Apr 2023 15:51:47 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Fri, 31 Mar 2023 20:54:00 +0200") Message-ID: <877cumqhik.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680983541; a=rsa-sha256; cv=none; b=huViP7/r/cgLr8JTQXFERazekQZ/rhvecjeVhuoe+E+zzfZl3pe7zxhIlEO+R2XHicAo88 Ahrmz1KizskllgFRBp0DPLPbAHZ/ho8DIfIUTvkhrP0ZtedC7ukNd1QWBnnoNS5KnEDfKs ygF9OQiGDOOSn9npN3Tf6w7Hl736jMtCvWS39kBwWXG24ra6PmCAs92epYWjjiYNVHyelD O6MElflPBLUNwv980Imm652eu4iAu3tS84Hnf+RKhRndIaOCTWIJ7I5aVopzNYcl9XD+r9 ehERSVxfLQYkSqLnkNTFVKGGYAX/ddH98Ey4C4uaPuOBFC7G5Pac7iIvAFbb1w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=LtuZGMWv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680983541; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=nkhZS5oe/Zj20YgVYtoy+VQjrvO2PxLEA0u8Gyii1DQ=; b=B9t8LfucrAeSxo6ty2wuahUqkOgqJnE9eiBoMSatbOFgyle+pcm/B3EqnxMafA3lR2Jihi SBermhNOyIE1epq0FMvR4jGyAuKPKPG6ajxcnKOO1Ihf9jBTtXryT/qXagOibIXXT2cZml x2IhpuX1qmPqhoVa2gBKeTA1AYjEWhunrxoxDme7yi2ChHNaF35Ba6tZNq5PuMQ+toSAp/ qyGcpETMpBiVHktfHLJvENCtLNG9SWKGFAGfpzK0g2eDWDkXVxT/lr+ZgHGB5/1OQgjDgf iA4UfXJQbrarqdG9P1G1qLIKF2Jv4yTXfgTa7qNRDlCEgSwqfL8AiuSh9okQaw== X-Migadu-Spam-Score: 7.28 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=LtuZGMWv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Spam-Score: 7.28 X-Migadu-Queue-Id: 8148831A2E X-TUID: UF1Ux+xeElV9 Hi, Liliana Marie Prikler writes: > * 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. Could we simply make lib2geom the latest? I think inkscape is its sole user. > (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")) It'd be nice (in a follow-up commit) to get rid of these input labels and use gexps for the arguments, while we're touching it. -- Thanks, Maxim