Subject: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2

From: Maxim Cournoyer <[email-masked]>
Date: Tue, 05 Sep 2023 11:06:15 -0400

Hello,

Andy Tai <[email-masked]> 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