From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oJHENi5E92SYqQAAauVa8A:P1 (envelope-from ) for ; Tue, 05 Sep 2023 17:07:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oJHENi5E92SYqQAAauVa8A (envelope-from ) for ; Tue, 05 Sep 2023 17:07:26 +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 77B9A35FAC for ; Tue, 5 Sep 2023 17:07:26 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=TZI0++Hp; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693926446; 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=BqbDuacnFwnjIxuV2O225f4bn0KC8qUdSKS09aCf0dA=; b=lmbWpmF8xkY9eHvk4SQrSWULT8ServUptGXytj6NbKuVWZv+Wo2cGjxxKJy7sMdsiCbWTH TXtRpWwGRQ0pI2VQr65dg/KWBE1u6ytQtKT7RiCVu9l2WLjhjny96FqdmKRDytAsAeWb1U w5GIIDF7tyZzJcSWX5UiFbfkuMWLzcKA1m3dlLVwT5VGVcSVQD/8SjdIUGbuBEwigNv99T sUTZCEEb3nQph9t5v7nZI9Pjg9JZ0sYS2m1tu6nDACBMo2kTzIZSOISWy0/JEiI9Xk2O4k NfCt7n1GTar8BipWUZeh3v9nslURjXcZ3ZXTI72pBCNzXVngsYRhvoTI7+HJHg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693926446; a=rsa-sha256; cv=none; b=EC8eBxi+pD9je9i+QjmrOr0aOjpaZVA6UJfYzsmT06QRXMiqm311IkdbdOHscQSQI2HWMy ktFuSR2SWqUDdEvMZBIIPefLaeaTc+VgJddBrtUTqqhuP6pknExglDnTYgftNg1vH/BWVy RD3ODezKay87Bbu02X6DpHitXU02C9D5YHLZ5ytgT/UPz+e01CqQrCYXx1SnzsO7lM7p98 aVZWOzfJ0MhFzetcC4tC9phW66ZyiDA8nmrrYjx8iF4aLEqQs285A42fJAuRWIgV9asth8 bGxeTBIfdSViA7ISOw7UJkl1JiJ8Egr/qrjJtWWrI6VjsTp8lDvJxdg8t1cMGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=TZI0++Hp; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdXe1-0007ep-PW; Tue, 05 Sep 2023 11:07:13 -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 1qdXdt-0007bP-N9 for guix-patches@gnu.org; Tue, 05 Sep 2023 11:07: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 1qdXdt-0008FP-E6 for guix-patches@gnu.org; Tue, 05 Sep 2023 11:07:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdXdt-0006DL-Nw for guix-patches@gnu.org; Tue, 05 Sep 2023 11:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2023 15:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64867 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andy Tai Cc: 64867@debbugs.gnu.org Received: via spool by 64867-submit@debbugs.gnu.org id=B64867.169392639023833 (code B ref 64867); Tue, 05 Sep 2023 15:07:01 +0000 Received: (at 64867) by debbugs.gnu.org; 5 Sep 2023 15:06:30 +0000 Received: from localhost ([127.0.0.1]:57753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXdJ-0006C9-Lx for submit@debbugs.gnu.org; Tue, 05 Sep 2023 11:06:29 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:48319) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXdH-0006Bt-KK for 64867@debbugs.gnu.org; Tue, 05 Sep 2023 11:06:24 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-4122129390eso15272321cf.0 for <64867@debbugs.gnu.org>; Tue, 05 Sep 2023 08:06:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693926377; x=1694531177; darn=debbugs.gnu.org; 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=BqbDuacnFwnjIxuV2O225f4bn0KC8qUdSKS09aCf0dA=; b=TZI0++HpVBtFilMtz53QC619RUjfhniV0rWEEhjffzLBOPhWdf9QDcwiYg7nGmvjTi eqD4nAqICNidKtemRQFosodYeieW0LdAmFP+Ho6jJjpnH+7YukocIRDz/JVembExD1TH 9aUJvLOrT2omHCO0wOMf4pgCOPUSnZGj99tpu7CyoeiGZJCtKHGp/05V5dyr7ADKlo1G jo5B/kHwrRyKR6UT5KAmL1yTOrQXgdLP8odi6TF31yPtVx1Pb48aTwJVtTVsEtu/LGPp A+YFNkC4UgMNHtu+gc567ArT3Zv3HK0bwXcv4yXv/s/xF9kI3zbxeI2REn/go3FeXu8V vMOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693926377; x=1694531177; 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=BqbDuacnFwnjIxuV2O225f4bn0KC8qUdSKS09aCf0dA=; b=H0FVQBPYHhxSrYCQ0o8XbdzF2j2W25VcSmiVIat49q0Qtl9kfL981KjWJNJUuFGU28 fwAizln7EWGYKZyPobfdioA17ShJqAkzlY2f1wSWovc66Zc7uUS09QOWCkIxTv41S57W 9d7Sr9kbAx6AU5fWpNYolyMQZdGbwB3jof4mnpA2jCvNqLGRbekcuEFmxLouzWS7C08h PAvhHexQkPl263lZZXov2+pjT2lSABWbiTF6VJRwXWClO2vS8jXsrVrTSqcNGEN3eZqk uoNBlQiXa2QBhyaEwvUp637hoVgec+m9GVaoOUeltMeSq8YyNYLWpAwtkfqg9xIqvY71 TKig== X-Gm-Message-State: AOJu0YwMuwbtnftapGbIaBTYE0XDU/nbaJCGUUwEnbUypGNlr1ZfBtpo g+B/h1AWKtuVZAdOPWlgfo5Q5aZ39YPNvw== X-Google-Smtp-Source: AGHT+IFNgrLd5/fL5yn4lGBOdUFKpWzvrbEr/sXnSBz/vVzp2gGD1qpfNX+K7/XBNn8otVPWcdKuyQ== X-Received: by 2002:ac8:4e89:0:b0:410:ace2:3d9 with SMTP id 9-20020ac84e89000000b00410ace203d9mr15488612qtp.30.1693926377029; Tue, 05 Sep 2023 08:06:17 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id d4-20020ac84e24000000b0040ff1b4b400sm2625532qtw.73.2023.09.05.08.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 08:06:16 -0700 (PDT) From: Maxim Cournoyer References: <87c693cd5cce2aaf8143d1c402edab25f98a05a7.1690351754.git.atai@atai.org> <26b7015b7e56c467f8f313d0179e1872f37a9810.1690435249.git.atai@atai.org> Date: Tue, 05 Sep 2023 11:06:15 -0400 In-Reply-To: <26b7015b7e56c467f8f313d0179e1872f37a9810.1690435249.git.atai@atai.org> (Andy Tai's message of "Wed, 26 Jul 2023 22:21:27 -0700") Message-ID: <87msy0irrs.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 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -5.13 X-Spam-Score: -5.13 X-Migadu-Queue-Id: 77B9A35FAC X-TUID: u9YQwHq27mx0 Hello, Andy Tai writes: > * gnu/packages/inkscape.scm (inkscape): Update to 1.2.2 You forgot to mention the actual (other) changes. readline was added; is this intentional? The changelog helps ensuring it is. > --- > gnu/packages/inkscape.scm | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm > index aa2c6419a0..6b6ffb2738 100644 > --- a/gnu/packages/inkscape.scm > +++ b/gnu/packages/inkscape.scm > @@ -50,6 +50,7 @@ (define-module (gnu packages inkscape) > #:use-module (gnu packages python) > #:use-module (gnu packages python-web) > #:use-module (gnu packages python-xyz) > + #:use-module (gnu packages readline) > #:use-module (gnu packages xml) > #:use-module (gnu packages ghostscript) > #:use-module (gnu packages fontutils) > @@ -286,7 +287,7 @@ (define-public inkscape > (package > (inherit inkscape/stable) > (name "inkscape") > - (version "1.2.1") > + (version "1.2.2") > (source > (origin > (inherit (package-source inkscape/stable)) > @@ -294,13 +295,18 @@ (define-public inkscape > (uri (string-append "https://media.inkscape.org/dl/" > "resources/file/" > "inkscape-" version ".tar.xz")) > + (patches (list )) I'd use '() (and perhaps a comment). > (sha256 > - (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) > + (base32 "1i55x0zbmwgvcl8fai9m3zy7rpc0rwfk1vs8wqsib8n00c6zvix0")))) > (build-system cmake-build-system) > (arguments > (substitute-keyword-arguments (package-arguments inkscape/stable) > ((#:phases phases) > `(modify-phases ,phases > + (add-after 'unpack 'fix-unaliased-2geom-reference > + (lambda _ > + (substitute* (find-files "." "CMakeLists.txt") > + (("2Geom::2geom") "2geom")))) I'm a bit surprised by this change; did upstream update their way to detect 2geom? Perhaps we could stop unbundling it ourselves. > (replace 'wrap-program > ;; Ensure Python is available at runtime. > (lambda* (#:key outputs #:allow-other-keys) > @@ -313,5 +319,7 @@ (define-public inkscape > `("GDK_PIXBUF_MODULE_FILE" = > (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))) > (inputs (modify-inputs (package-inputs inkscape/stable) > - (append python-cssselect))) ;to render qrcode > + (append gspell lib2geom > + python-cssselect ;to render qrcode > + readline))) One package per line would be more readable here. (append package1 package2 ...) -- Thanks, Maxim