GNU bug report logs - #64867
[PATCH] gnu: inkscape: Update to 1.2.2

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64867 in the body.
You can then email your comments to 64867 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH] gnu: inkscape: Update to 1.2.2
Date: Tue, 25 Jul 2023 23:09:53 -0700

* gnu/packages/inkscape.scm (inkscape): Update to 1.2.2
---
 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..41fdbf22d0 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 ))
        (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"))))
            (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 gtksourceview-4 lib2geom
+               python-cssselect  ;to render qrcode
+               readline )))
     (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))

base-commit: 76e041f9eef85bb039c5251d3350c62ee2066883
-- 
2.41.0

Message #8 received at 64867 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 64867 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2] gnu: inkscape: Update to 1.2.2
Date: Wed, 26 Jul 2023 22:21:27 -0700

* gnu/packages/inkscape.scm (inkscape): Update to 1.2.2
---
 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 ))
        (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"))))
            (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)))
     (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))

base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47
-- 
2.41.0

Message #11 received at 64867 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Andy Tai <atai <at> atai.org>
Cc: 64867 <at> debbugs.gnu.org
Subject: Re: bug#64867: [PATCH] gnu: inkscape: Update to 1.2.2
Date: Tue, 05 Sep 2023 11:06:15 -0400

Hello,

Andy Tai <atai <at> 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

Message #16 received at 64867 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Andy Tai <atai <at> atai.org>
Cc: 64867 <at> debbugs.gnu.org
Subject: Re: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2
Date: Wed, 24 Jan 2024 09:58:24 -0500

Hello,

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hello,
>
> Andy Tai <atai <at> 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.

Gentle ping!

-- 
Thanks,
Maxim

Message #19 received at 64867 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 64867 <at> debbugs.gnu.org
Subject: Re: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2
Date: Wed, 24 Jan 2024 07:37:54 -0800

[Message part 1 (text/plain, inline)]

OK I will update

On Wed, Jan 24, 2024 at 6:58 AM Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
wrote:

> Hello,
>
> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
> > Hello,
> >
> > Andy Tai <atai <at> 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.
>
> Gentle ping!
>
> --
> Thanks,
> Maxim
>


-- 
Andy Tai, atai <at> atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2023 民國112年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[Message part 2 (text/html, inline)]

Message #26 received at 64867-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Andy Tai <atai <at> atai.org>
Cc: 64867-done <at> debbugs.gnu.org
Subject: Re: [bug#64867] [PATCH] gnu: inkscape: Update to 1.2.2
Date: Sat, 09 Mar 2024 13:34:02 -0500

Hi,

Andy Tai <atai <at> atai.org> writes:

> OK I will update
>
> On Wed, Jan 24, 2024 at 6:58 AM Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> wrote:
>
>> Hello,
>>
>> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>>
>> > Hello,
>> >
>> > Andy Tai <atai <at> 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.

Inkscape has since been updated to 1.3.2 on core-updates.

Closing!

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.