From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Andy Tai <atai@atai.org>
Cc: 64867@debbugs.gnu.org
Subject: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2
Date: Tue, 05 Sep 2023 11:06:15 -0400 [thread overview]
Message-ID: <87msy0irrs.fsf_-_@gmail.com> (raw)
In-Reply-To: <26b7015b7e56c467f8f313d0179e1872f37a9810.1690435249.git.atai@atai.org> (Andy Tai's message of "Wed, 26 Jul 2023 22:21:27 -0700")
Hello,
Andy Tai <atai@atai.org> 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
next prev parent reply other threads:[~2023-09-05 15:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-26 6:09 [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2 Andy Tai
2023-07-27 5:21 ` [bug#64867] [PATCH v2] " Andy Tai
2023-09-05 15:06 ` Maxim Cournoyer [this message]
2024-01-24 14:58 ` [bug#64867] [PATCH] " Maxim Cournoyer
2024-01-24 15:37 ` Andy Tai
2024-03-09 18:34 ` bug#64867: " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87msy0irrs.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=64867@debbugs.gnu.org \
--cc=atai@atai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).